diff --git a/src/auth.js b/src/auth.js
index bab2ab1e6..7ffb63bdc 100644
--- a/src/auth.js
+++ b/src/auth.js
@@ -34,7 +34,7 @@ function initialize(callback) {
         user.get(userId, function (error, result) {
             if (error) return callback(error);
 
-            var md5 = crypto.createHash('md5').update(result.fallbackEmail || result.email).digest('hex');
+            var md5 = crypto.createHash('md5').update(result.email).digest('hex');
             result.gravatar = 'https://www.gravatar.com/avatar/' + md5 + '.jpg?s=24&d=mm';
 
             callback(null, result);
diff --git a/webadmin/src/js/client.js b/webadmin/src/js/client.js
index 01767993f..ef79c3eb4 100644
--- a/webadmin/src/js/client.js
+++ b/webadmin/src/js/client.js
@@ -220,8 +220,8 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N
         this._userInfo.fallbackEmail = userInfo.fallbackEmail;
         this._userInfo.displayName = userInfo.displayName;
         this._userInfo.admin = !!userInfo.admin;
-        this._userInfo.gravatar = 'https://www.gravatar.com/avatar/' + md5.createHash(userInfo.fallbackEmail || userInfo.email) + '.jpg?s=24&d=mm';
-        this._userInfo.gravatarHuge = 'https://www.gravatar.com/avatar/' + md5.createHash(userInfo.fallbackEmail || userInfo.email) + '.jpg?s=128&d=mm';
+        this._userInfo.gravatar = 'https://www.gravatar.com/avatar/' + md5.createHash(userInfo.email) + '.jpg?s=24&d=mm';
+        this._userInfo.gravatarHuge = 'https://www.gravatar.com/avatar/' + md5.createHash(userInfo.email) + '.jpg?s=128&d=mm';
     };
 
     Client.prototype.setConfig = function (config) {