diff --git a/common/models/User-Identity.js b/common/models/User-Identity.js
index 3df7f01400..a69685cc29 100644
--- a/common/models/User-Identity.js
+++ b/common/models/User-Identity.js
@@ -1,3 +1,4 @@
+import assign from 'object.assign';
 import debugFactory from 'debug';
 
 const debug = debugFactory('freecc:models:userIdent');
@@ -10,6 +11,39 @@ function getFirstImageFromProfile(profile) {
     null;
 }
 
+// using es6 argument destructing
+function setProfileFromGithub(
+  user,
+  {
+    profileUrl: githubURL,
+    username
+  },
+  {
+    location,
+    email: githubEmail,
+    id: githubId,
+    'created_at': joinedGithubOn,
+    blog: website,
+    name
+  }
+) {
+  return assign(
+    user,
+    { isGithubCool: true, isMigrationGrandfathered: false },
+    {
+      name,
+      username: username.toLowerCase(),
+      location,
+      joinedGithubOn,
+      website,
+      githubId,
+      githubURL,
+      githubEmail,
+      githubProfile: githubURL
+    }
+  );
+}
+
 export default function(UserIdent) {
  UserIdent.observe('before save', function(ctx, next) {
   var userIdent = ctx.currentInstance || ctx.instance;
@@ -25,7 +59,8 @@ export default function(UserIdent) {
       return next();
     }
 
-    const picture = getFirstImageFromProfile(userIdent.profile);
+    const { profile } = userIdent;
+    const picture = getFirstImageFromProfile(profile);
 
     debug('picture', picture, user.picture);
     // check if picture was found
@@ -41,19 +76,10 @@ export default function(UserIdent) {
       userChanged = true;
     }
 
-    // if user signed in with github
-    // and user is not github cool
-    // or username is different from github username
-    // then make them github cool
-    // and set their username from their github profile.
-    if (
-      userIdent.provider === 'github-login' &&
-      (!user.isGithubCool ||
-        user.username !== userIdent.provider.username.toLowerCase())
-    ) {
+    // if user signed in with github refresh their info
+    if (userIdent.provider === 'github-login') {
       debug("user isn't github cool or username from github is different");
-      user.isGithubCool = true;
-      user.username = userIdent.profile.username.toLowerCase();
+      setProfileFromGithub(user, profile, profile._json);
       userChanged = true;
     }
 
diff --git a/common/models/user.json b/common/models/user.json
index 32ef5e3c19..b961807093 100644
--- a/common/models/user.json
+++ b/common/models/user.json
@@ -27,6 +27,18 @@
       "type": "boolean",
       "default": false
     },
+    "githubId": {
+      "type": "string"
+    },
+    "githubURL": {
+      "type": "string"
+    },
+    "githubEmail": {
+      "type": "string"
+    },
+    "joinedGithubOn": {
+      "type": "date"
+    },
     "isMigrationGrandfathered": {
       "type": "boolean",
       "default": false