diff --git a/src/libs/app.js b/src/libs/app.js
index b11df38f04587e65a4362daa19554cadfec3c9dd..ffe232b2c7faea6c6da83457ab06d5e5eff7ea43 100644
--- a/src/libs/app.js
+++ b/src/libs/app.js
@@ -14,16 +14,13 @@ const app = express();
 
 const api = require('./routes/api');
 
-const mongoose = require('./db/mongoose');
-
-const db = mongoose();
 
 const passport = require('passport');
 const jwt = require('jwt-simple');
 
 app.use(passport.initialize());
 
-process.env.NODE_ENV = process.env.NODE_ENV || 'development';
+require('./middlewares/passport');
 
 app.use(bodyParser.json());
 app.use(bodyParser.urlencoded({ extended: false }));
diff --git a/src/server.js b/src/server.js
index d2521c74b8ddee920daf422fd2c7f1b9fa63b648..54f2e543ac0dca059217eeb900e7396f3f3f72a2 100644
--- a/src/server.js
+++ b/src/server.js
@@ -8,8 +8,15 @@ const log = require(`${libs}/log`)(module);
 
 const app = require(`${libs}/app`);
 
-app.set('port', process.env.PORT || config.get('port') || 3000);
+const mongoose = require('./db/mongoose');
+
+const db = mongoose();
+
+process.env.NODE_ENV = process.env.NODE_ENV || 'development';
+
+app.set('port', config.get('port') || 3000);
 
 const server = app.listen(app.get('port'), () => {
-    log.info(`Express server listening on port ${server.address().port}`);
+    debug(`Express server listening on port ${server.address().port}`);
+    log.info(`Express server listening on port ${config.get('port')}`);
 });