diff --git a/client/modules/User/pages/SignupView.js b/client/modules/User/pages/SignupView.js
index 795c41c4..a7ec9ef3 100644
--- a/client/modules/User/pages/SignupView.js
+++ b/client/modules/User/pages/SignupView.js
@@ -3,15 +3,12 @@ import { bindActionCreators } from 'redux';
 import * as UserActions from '../actions';
 import { reduxForm } from 'redux-form';
 import SignupForm from '../components/SignupForm';
-import GithubButton from '../components/GithubButton';
 
 function SignupView(props) {
   return (
     <div className="signup">
       <h1>Sign Up</h1>
       <SignupForm {...props} />
-      <h2 className="signup__divider">Or</h2>
-      <GithubButton buttonText="Sign Up with Github" />
     </div>
   );
 }
diff --git a/server/config/passport.js b/server/config/passport.js
index 557d70f3..56f91859 100644
--- a/server/config/passport.js
+++ b/server/config/passport.js
@@ -40,44 +40,31 @@ passport.use(new GitHubStrategy({
   callbackURL: '/auth/github/callback',
   passReqToCallback: true
 }, (req, accessToken, refreshToken, profile, done) => {
-  if (req.user) {
-    // the user should actually never get here.
-    User.findOne({ github: profile.id }, (err, existingUser) => {
-      if (existingUser) {
-        return res.json({'errors', { msg: 'There is already a GitHub account that belongs to you. Sign in with that account or delete it, then link it with your current account.' }});
+  User.findOne({ github: profile.id }, (err, existingUser) => {
+    if (existingUser) {
+      return done(null, existingUser);
+    }
+    User.findOne({ email: profile._json.email }, (err, existingEmailUser) => {
+      if (existingEmailUser) {
+        existingEmailUser.email = existingEmailUser.email || profile._json.email;
+        existingEmailUser.github = profile.id;
+        existingEmailUser.username = existingEmailUser.username || profile.username;
+        existingEmailUser.tokens.push({ kind: 'github', accessToken });
+        existingEmailUser.name = existingEmailUser.name || profile.displayName;
+        existingEmailUser.save((err) => {
+          return done(null, existingEmailUser);
+        });
       } else {
-        User.findById(req.user.id, (err, user) => {
-          user.email = user.email || profile._json.email;
-          user.github = profile.id;
-          user.username = user.username || profile.username;
-          user.tokens.push({ kind: 'github', accessToken });
-          user.name = user.name || profile.displayName;
-          user.save((err) => {
-            return res.json({'info', { msg: 'GitHub account has been linked.' }});
-          });
+        const user = new User();
+        user.email = profile._json.email;
+        user.github = profile.id;
+        user.username = profile.username;
+        user.tokens.push({ kind: 'github', accessToken });
+        user.name = profile.displayName;
+        user.save((err) => {
+          return done(null, user);
         });
       }
     });
-  } else {
-    User.findOne({ github: profile.id }, (err, existingUser) => {
-      if (existingUser) {
-        return done(null, existingUser);
-      }
-      User.findOne({ email: profile._json.email }, (err, existingEmailUser) => {
-        if (existingEmailUser) {
-          return res.json('errors', { msg: 'There is already an account using this email address. Sign in to that account and link it with GitHub manually from Account Settings.' });
-        } else {
-          const user = new User();
-          user.email = profile._json.email;
-          user.github = profile.id;
-          user.username = profile.username;
-          user.tokens.push({ kind: 'github', accessToken });
-          user.name = profile.displayName;
-          user.save((err) => {
-            return res.json({'info', { msg: 'Account has been created with GitHub credentials.' }});
-          });
-        }
-      });
-    });
-  }
+  });
 }));