diff --git a/common/models/user.js b/common/models/user.js
index b7daadd6042..ff8aa1e397c 100644
--- a/common/models/user.js
+++ b/common/models/user.js
@@ -515,7 +515,7 @@ module.exports = function(User) {
           .flatMap(token => {
 
           const { id: loginToken } = token;
-          const loginEmail = user.email;
+          const loginEmail = new Buffer(user.email).toString('base64');
           const host = getServerFullURL();
           const mailOptions = {
             type: 'email',
diff --git a/server/boot/user.js b/server/boot/user.js
index ee7faee3eb6..70428f48087 100644
--- a/server/boot/user.js
+++ b/server/boot/user.js
@@ -269,7 +269,7 @@ module.exports = function(app) {
     }
 
     const authTokenId = req.query.token;
-    const authEmailId = req.query.email;
+    const authEmailId = new Buffer(req.query.email, 'base64').toString();
 
     return AccessToken.findOne$({ where: {id: authTokenId} })
      .map(authToken => {
@@ -319,7 +319,7 @@ module.exports = function(app) {
       return res.redirect('/email-signin');
     }
 
-    const email = req.query.email;
+    const email = new Buffer(req.query.email, 'base64').toString();
 
     return User.findOne$({ where: { email }})
       .map(user => {