diff --git a/common/models/user.js b/common/models/user.js
index 69472224ff..fb53ab216e 100644
--- a/common/models/user.js
+++ b/common/models/user.js
@@ -518,11 +518,11 @@ module.exports = function(User) {
     )({ ttl });
   };
 
-  User.prototype.getEncodedEmail = function getEncodedEmail() {
-    if (!this.email) {
+  User.prototype.getEncodedEmail = function getEncodedEmail(email) {
+    if (!email) {
       return null;
     }
-    return Buffer(this.email).toString('base64');
+    return Buffer(email).toString('base64');
   };
 
   User.decodeEmail = email => Buffer(email, 'base64').toString();
diff --git a/server/middlewares/email-not-verified-notice.js b/server/middlewares/email-not-verified-notice.js
index 0c53d14797..7cdd6f42e4 100644
--- a/server/middlewares/email-not-verified-notice.js
+++ b/server/middlewares/email-not-verified-notice.js
@@ -19,7 +19,7 @@ export default function emailNotVerifiedNotice() {
       const { user } = req;
       if (user && (!user.email || user.email === '' || !user.emailVerified)) {
         req.flash(
-          'danger',
+          'info',
           dedent`
   New privacy laws now require that we have an email address where we can reach
   you. Please verify your email address below and click the link we send you to