diff --git a/package-lock.json b/package-lock.json
index 9f5b376f90..4710aa2848 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,6 +4,29 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@freecodecamp/loopback-component-passport": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@freecodecamp/loopback-component-passport/-/loopback-component-passport-1.0.0.tgz",
+      "integrity": "sha512-F+zabjU/pyceekZ6dSVg4fu0ApEiR/TqMEmJbDV+h/gut51CgyA2Q9OHnbtqcDhPvsdCdbxY2s+XmqjJGBVH2A==",
+      "requires": {
+        "passport": "0.4.0",
+        "strong-globalize": "2.10.0",
+        "underscore": "1.9.0",
+        "uuid": "3.2.1"
+      },
+      "dependencies": {
+        "underscore": {
+          "version": "1.9.0",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.0.tgz",
+          "integrity": "sha512-4IV1DSSxC1QK48j9ONFK1MoIAKKkbE8i7u55w2R6IqBqbT7A/iG7aZBCR2Bi8piF0Uz+i/MG1aeqLwl/5vqF+A=="
+        },
+        "uuid": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
+          "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA=="
+        }
+      }
+    },
     "@gulp-sourcemaps/identity-map": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-1.0.1.tgz",
@@ -1262,11 +1285,6 @@
       "integrity": "sha1-mumh9KjcZ/DN7E9K7aHkOl/2XiU=",
       "dev": true
     },
-    "babel-plugin-add-react-displayname": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/babel-plugin-add-react-displayname/-/babel-plugin-add-react-displayname-0.0.5.tgz",
-      "integrity": "sha1-M51M3be2X9YtHfnbn+BN4TQSK9U="
-    },
     "babel-plugin-check-es2015-constants": {
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
@@ -11350,27 +11368,6 @@
         }
       }
     },
-    "loopback-component-passport": {
-      "version": "git+https://github.com/freeCodeCamp/loopback-component-passport.git#6097e69ec12ecfb306c8c83aa6af66f7e25fbb95",
-      "requires": {
-        "passport": "0.4.0",
-        "strong-globalize": "2.10.0",
-        "underscore": "1.9.0",
-        "uuid": "3.2.1"
-      },
-      "dependencies": {
-        "underscore": {
-          "version": "1.9.0",
-          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.0.tgz",
-          "integrity": "sha512-4IV1DSSxC1QK48j9ONFK1MoIAKKkbE8i7u55w2R6IqBqbT7A/iG7aZBCR2Bi8piF0Uz+i/MG1aeqLwl/5vqF+A=="
-        },
-        "uuid": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
-          "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA=="
-        }
-      }
-    },
     "loopback-connector": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/loopback-connector/-/loopback-connector-4.4.0.tgz",
diff --git a/package.json b/package.json
index 20bd121964..e3099a89b8 100644
--- a/package.json
+++ b/package.json
@@ -38,6 +38,7 @@
   },
   "license": "(BSD-3-Clause AND CC-BY-SA-4.0)",
   "dependencies": {
+    "@freecodecamp/loopback-component-passport": "^1.0.0",
     "accepts": "^1.3.0",
     "babel-core": "^6.18.1",
     "babel-preset-es2015": "^6.3.13",
@@ -86,7 +87,6 @@
     "lodash": "^4.1.0",
     "loopback": "^3.11.1",
     "loopback-boot": "^2.27.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/component-passport.js b/server/component-passport.js
index 04b0f4135a..f08305a4f2 100644
--- a/server/component-passport.js
+++ b/server/component-passport.js
@@ -1,5 +1,6 @@
 import passport from 'passport';
-import { PassportConfigurator } from 'loopback-component-passport';
+import { PassportConfigurator } from
+ '@freecodecamp/loopback-component-passport';
 import passportProviders from './passport-providers';
 
 const passportOptions = {