diff --git a/server/passport-providers.js b/server/passport-providers.js
index 3c779a162e..907b4c849a 100644
--- a/server/passport-providers.js
+++ b/server/passport-providers.js
@@ -104,6 +104,9 @@ module.exports = {
     clientID: process.env.LINKEDIN_ID,
     clientSecret: process.env.LINKEDIN_SECRET,
     scope: ['r_fullprofile', 'r_emailaddress'],
+    oAuthOptions: {
+      state: process.ENV.LINKED_STATE
+    },
     failureFlash: true
   },
   'linkedin-link': {
@@ -118,6 +121,9 @@ module.exports = {
     clientID: process.env.LINKEDIN_ID,
     clientSecret: process.env.LINKEDIN_SECRET,
     scope: ['r_fullprofile', 'r_emailaddress'],
+    authOptions: {
+      state: process.ENV.LINKED_STATE
+    },
     failureFlash: true
   }
 };
diff --git a/server/server.js b/server/server.js
index 9d4734443d..27ec95b289 100755
--- a/server/server.js
+++ b/server/server.js
@@ -257,8 +257,8 @@ R.keys(passportProviders).map(function(strategy) {
  * 500 Error Handler.
  */
 
-//if (process.env.NODE_ENV === 'development') {
-if (true) {
+// if (process.env.NODE_ENV === 'development') {
+if (true) { // eslint-disable-line
   app.use(errorHandler({
     log: true
   }));