diff --git a/app/core/social-handlers/GitHubHandler.coffee b/app/core/social-handlers/GitHubHandler.coffee
index 57d8a00c3..9d734c712 100644
--- a/app/core/social-handlers/GitHubHandler.coffee
+++ b/app/core/social-handlers/GitHubHandler.coffee
@@ -19,4 +19,4 @@ module.exports = class GitHubHandler extends CocoClass
       client_id: @clientID
       redirect_uri: @redirectURI
 
-    location.href = "https://github.com/login/oauth/authorize?" + $.param(request)
+    location.href = "https://github.com/login/oauth/authorize?" + $.param(request)
\ No newline at end of file
diff --git a/app/templates/core/auth.jade b/app/templates/core/auth.jade
index b3a39e769..4cc29e3a5 100644
--- a/app/templates/core/auth.jade
+++ b/app/templates/core/auth.jade
@@ -83,7 +83,7 @@
         h3(data-i18n="signup.creating") Creating Account...
 
   .auth-network-logins
-    // GitHub login too buggy to survive
+    // GitHub login complete, but the button does not fit in with the design yet. Hidden for now
     //div.network-login
     //  btn.btn.btn-sm.github-login-button#github-login-button
     //    img(src="/images/pages/modal/auth/github_icon.png")
diff --git a/server/routes/github.coffee b/server/routes/github.coffee
index 9887dae40..cff00ba0d 100644
--- a/server/routes/github.coffee
+++ b/server/routes/github.coffee
@@ -28,26 +28,35 @@ module.exports.setup = (app) ->
           return log.error err if err?
           githubUser = JSON.parse response
           log.info 'Got GitHub auth callback response', githubUser
-          emailLower = githubUser.email?.toLowerCase()
-          if not emailLower
-            return errors.serverError res, "Problem finding GitHub user with that identity."
+          
+          request.get {uri: 'https://api.github.com/user/emails', headers: headers}, (err, r, response) ->
+            return log.error err if err?
+            githubUserEmails = JSON.parse response
+            log.info 'Got GitHub user emails', githubUserEmails
+            
+            emailLower = _.find githubUserEmails, (email) -> email.primary is true
+            emailLower = emailLower.email.toLowerCase()
+            log.info 'Got primary Github email', emailLower
+          
+            if not emailLower
+             return errors.serverError res, "Problem finding GitHub user with that identity."
 
-          # GitHub users can change emails
-          User.findOne {$or: [{emailLower: emailLower}, {githubID: githubUser.id}]}, (err, user) ->
-            return errors.serverError res, err if err?
-            wrapup = (err, user) ->
+            # GitHub users can change emails
+            User.findOne {$or: [{emailLower: emailLower}, {githubID: githubUser.id}]}, (err, user) ->
               return errors.serverError res, err if err?
-              req.login (user), (err) ->
+              wrapup = (err, user) ->
                 return errors.serverError res, err if err?
-                res.redirect '/'
-            unless user
-              req.user.set 'email', githubUser.email
-              req.user.set 'githubID', githubUser.id
-              req.user.save wrapup
-            else if user.get('githubID') isnt githubUser.id # Add or replace githubID to/with existing user
-              user.set 'githubID', githubUser.id
-              user.save wrapup
-            else if user.get('emailLower') isnt emailLower # Existing GitHub user with us changed email
-              user.update {email: githubUser.email}, (err) -> wrapup err, user
-            else # All good you've been here before
-              wrapup null, user
+                req.login (user), (err) ->
+                  return errors.serverError res, err if err?
+                  res.redirect '/'
+              unless user
+                req.user.set 'email', emailLower
+                req.user.set 'githubID', githubUser.id
+                req.user.save wrapup
+              else if user.get('githubID') isnt githubUser.id # Add or replace githubID to/with existing user
+                user.set 'githubID', githubUser.id
+                user.save wrapup
+              else if user.get('emailLower') isnt emailLower # Existing GitHub user with us changed email
+                user.update {email: emailLower}, (err) -> wrapup err, user
+              else # All good you've been here before
+                wrapup null, user