diff --git a/src/routes/authentication.js b/src/routes/authentication.js
index cbc3841872..d6b98aa057 100644
--- a/src/routes/authentication.js
+++ b/src/routes/authentication.js
@@ -16,15 +16,8 @@ let loginStrategies = [];
 const Auth = module.exports;
 
 Auth.initialize = function (app, middleware) {
-	const passportInitMiddleware = passport.initialize();
-	app.use((req, res, next) => {
-		passportInitMiddleware(req, res, next);
-	});
-	const passportSessionMiddleware = passport.session();
-	app.use((req, res, next) => {
-		passportSessionMiddleware(req, res, next);
-	});
-
+	app.use(passport.initialize());
+	app.use(passport.session());
 	app.use((req, res, next) => {
 		Auth.setAuthVars(req, res);
 		next();
diff --git a/src/webserver.js b/src/webserver.js
index 22343f6036..c246272b85 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -148,15 +148,8 @@ function setupExpressApp(app) {
 	configureBodyParser(app);
 
 	app.use(cookieParser(nconf.get('secret')));
-	const userAgentMiddleware = useragent.express();
-	app.use((req, res, next) => {
-		userAgentMiddleware(req, res, next);
-	});
-	const spiderDetectorMiddleware = detector.middleware();
-	app.use((req, res, next) => {
-		spiderDetectorMiddleware(req, res, next);
-	});
-
+	app.use(useragent.express());
+	app.use(detector.middleware());
 	app.use(session({
 		store: db.sessionStore,
 		secret: nconf.get('secret'),