diff --git a/src/middleware/index.js b/src/middleware/index.js
index 91d5a0e01d..4eafcdfa03 100644
--- a/src/middleware/index.js
+++ b/src/middleware/index.js
@@ -52,7 +52,7 @@ middleware.stripLeadingSlashes = function (req, res, next) {
 	}
 };
 
-middleware.pageView = function (req, res, next) {
+middleware.pageView = function pageView(req, res, next) {
 	analytics.pageView({
 		ip: req.ip,
 		uid: req.uid,
@@ -74,7 +74,7 @@ middleware.pageView = function (req, res, next) {
 };
 
 
-middleware.pluginHooks = function (req, res, next) {
+middleware.pluginHooks = function pluginHooks(req, res, next) {
 	async.each(plugins.loadedHooks['filter:router.page'] || [], function (hookObj, next) {
 		hookObj.method(req, res, next);
 	}, function (err) {
@@ -159,7 +159,7 @@ middleware.privateUploads = function (req, res, next) {
 	next();
 };
 
-middleware.busyCheck = function (req, res, next) {
+middleware.busyCheck = function busyCheck(req, res, next) {
 	if (global.env === 'production' && meta.config.eventLoopCheckEnabled && toobusy()) {
 		analytics.increment('errors:503');
 		res.status(503).type('text/html').sendFile(path.join(__dirname, '../../public/503.html'));
diff --git a/src/middleware/maintenance.js b/src/middleware/maintenance.js
index 6b7bb65082..4297c88494 100644
--- a/src/middleware/maintenance.js
+++ b/src/middleware/maintenance.js
@@ -6,7 +6,7 @@ var meta = require('../meta');
 var user = require('../user');
 
 module.exports = function (middleware) {
-	middleware.maintenanceMode = function (req, res, callback) {
+	middleware.maintenanceMode = function maintenanceMode(req, res, callback) {
 		if (!meta.config.maintenanceMode) {
 			return setImmediate(callback);
 		}
diff --git a/src/middleware/render.js b/src/middleware/render.js
index 4d6476dc34..d49a5dcee2 100644
--- a/src/middleware/render.js
+++ b/src/middleware/render.js
@@ -37,7 +37,7 @@ module.exports = function (middleware) {
 			var templateToRender;
 			async.waterfall([
 				function (next) {
-					options.loggedIn = !!req.uid;
+					options.loggedIn = req.uid > 0;
 					options.relative_path = nconf.get('relative_path');
 					options.template = { name: template };
 					options.template[template] = true;
diff --git a/src/middleware/user.js b/src/middleware/user.js
index fb765f0599..29f756eb52 100644
--- a/src/middleware/user.js
+++ b/src/middleware/user.js
@@ -129,7 +129,7 @@ module.exports = function (middleware) {
 	};
 
 	middleware.redirectToAccountIfLoggedIn = function (req, res, next) {
-		if (req.session.forceLogin || !req.uid) {
+		if (req.session.forceLogin || req.uid <= 0) {
 			return next();
 		}
 
@@ -233,7 +233,7 @@ module.exports = function (middleware) {
 		res.status(403).render('403', { title: '[[global:403.title]]' });
 	};
 
-	middleware.registrationComplete = function (req, res, next) {
+	middleware.registrationComplete = function registrationComplete(req, res, next) {
 		// If the user's session contains registration data, redirect the user to complete registration
 		if (!req.session.hasOwnProperty('registration')) {
 			return setImmediate(next);
@@ -244,7 +244,7 @@ module.exports = function (middleware) {
 
 			controllers.helpers.redirect(res, '/register/complete');
 		} else {
-			return setImmediate(next);
+			setImmediate(next);
 		}
 	};
 };