diff --git a/package-lock.json b/package-lock.json
index 5b96b02ab0..9a685ba3ec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10924,24 +10924,13 @@
       }
     },
     "loopback-component-passport": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/loopback-component-passport/-/loopback-component-passport-3.4.1.tgz",
-      "integrity": "sha1-LHyB6iPHLkN56BFLmS16v5Af2IU=",
+      "version": "git+https://github.com/freeCodeCamp/loopback-component-passport.git#e158f6bbd631e00e0194515ae25b9971c58a1121",
       "requires": {
-        "passport": "0.3.2",
+        "passport": "0.4.0",
         "strong-globalize": "2.10.0",
         "underscore": "1.8.3"
       },
       "dependencies": {
-        "passport": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/passport/-/passport-0.3.2.tgz",
-          "integrity": "sha1-ndAJ+RXo/glbASSgG4+C2gdRAQI=",
-          "requires": {
-            "passport-strategy": "1.0.0",
-            "pause": "0.0.1"
-          }
-        },
         "underscore": {
           "version": "1.8.3",
           "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
diff --git a/package.json b/package.json
index c3505f9439..91c54abced 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "lodash": "^4.1.0",
     "loopback": "^3.11.1",
     "loopback-boot": "^2.26.1",
-    "loopback-component-passport": "^3.4.1",
+    "loopback-component-passport": "git+https://github.com/freeCodeCamp/loopback-component-passport.git#feat/freecodecamp",
     "loopback-connector-mongodb": "^3.2.1",
     "method-override": "^2.3.0",
     "moment": "^2.10.2",
diff --git a/server/boot/home.js b/server/boot/home.js
index 6e79563176..6d2dcc42e7 100644
--- a/server/boot/home.js
+++ b/server/boot/home.js
@@ -1,6 +1,5 @@
 import { defaultProfileImage } from '../../common/utils/constantStrings.json';
 import supportedLanguages from '../../common/utils/supported-languages';
-import dedent from 'dedent';
 
 const message =
   'Learn to Code and Help Nonprofits';
@@ -35,22 +34,9 @@ module.exports = function(app) {
     if (!supportedLanguages[req._urlLang]) {
       return next();
     }
-    const { referer = '' } = req.headers;
 
     if (req.user) {
-      if ((referer.indexOf('/settings') >= 1) && (req.user.isGithubCool)) {
-
-        const msg = dedent`
-              We've updated your profile based
-              on your your GitHub account.
-            `;
-        const username = req.user.username;
-
-        req.flash('info', { msg: msg});
-        return res.redirect(`/${username}`);
-      } else {
-        return res.redirect('/challenges/current-challenge');
-      }
+      return res.redirect('/challenges/current-challenge');
     }
 
     return res.render('home', { title: message });
diff --git a/server/passport-providers.js b/server/passport-providers.js
index 28d97a4ce7..847b862a25 100644
--- a/server/passport-providers.js
+++ b/server/passport-providers.js
@@ -159,8 +159,9 @@ export default {
     clientSecret: process.env.GITHUB_SECRET,
     link: true,
     failureFlash: true,
-    successFlash: [ 'We\'ve updated your profile based ',
-                    'on your your GitHub account.'
-                  ].join('')
+    successFlash: [
+      'We\'ve updated your profile based ',
+      'on your your GitHub account.'
+    ].join('')
   }
 };