diff --git a/lib/models/user.js b/lib/models/user.js
index d79530039..5532e5b31 100644
--- a/lib/models/user.js
+++ b/lib/models/user.js
@@ -133,6 +133,10 @@ module.exports = function (sequelize, DataTypes) {
         photo = generateAvatarURL(profile.username, profile.emails[0], bigger)
         break
       default:
+        if (profile.emails && profile.emails.length > 0) {
+          photo = generateAvatarURL(profile.username, profile.emails[0])
+          break
+        }
         photo = generateAvatarURL(profile.username)
         break
     }
diff --git a/lib/web/auth/oauth2/index.js b/lib/web/auth/oauth2/index.js
index e9032e0b1..feef5e7f9 100644
--- a/lib/web/auth/oauth2/index.js
+++ b/lib/web/auth/oauth2/index.js
@@ -62,7 +62,7 @@ function parseProfile (data) {
     id: id || username,
     username: username,
     displayName: displayName,
-    email: email
+    emails: email ? [email] : []
   }
 }