diff --git a/api-server/src/common/models/user.js b/api-server/src/common/models/user.js
index 5268cef5e05..4cb061fc27c 100644
--- a/api-server/src/common/models/user.js
+++ b/api-server/src/common/models/user.js
@@ -526,15 +526,17 @@ export default function initializeUser(User) {
           Observable.fromPromise(userUpdate)
         );
       })
-      .map(
-        () =>
-          'Check your email and click the link we sent you to confirm' +
-          ' your new email address.'
-      );
+      .map({
+        type: 'info',
+        message: dedent`Check your email and click the link we sent you to confirm your new email address.`
+      });
   }
 
   User.prototype.requestAuthEmail = requestAuthEmail;
 
+  /**
+   * @param {String} requestedEmail
+   */
   function requestUpdateEmail(requestedEmail) {
     const newEmail = ensureLowerCaseString(requestedEmail);
     const currentEmail = ensureLowerCaseString(this.email);
diff --git a/api-server/src/server/boot/settings.js b/api-server/src/server/boot/settings.js
index c3d8699aab8..f0c444e087f 100644
--- a/api-server/src/server/boot/settings.js
+++ b/api-server/src/server/boot/settings.js
@@ -95,7 +95,10 @@ function updateMyEmail(req, res, next) {
   } = req;
   return user
     .requestUpdateEmail(email)
-    .subscribe(message => res.json({ message }), next);
+    .subscribe(
+      message => res.json({ type: message.type, message: message.message }),
+      next
+    );
 }
 
 // Re-enable once we can handle the traffic