diff --git a/src/routes/authentication.js b/src/routes/authentication.js
index 21a0e17c5a..c08468b77d 100644
--- a/src/routes/authentication.js
+++ b/src/routes/authentication.js
@@ -81,18 +81,12 @@
 	}
 
 	Auth.create_routes = function(app) {
-		var build_header = function() {
-				return templates['header'].parse({
-					cssSrc: global.config['theme:src'] || '/vendor/bootstrap/css/bootstrap.min.css',
-					title: global.config['title'] || 'NodeBB'
-				});
-			};
 
 		app.get('/logout', function(req, res) {
 			console.log('info: [Auth] Session ' + req.sessionID + ' logout (uid: ' + global.uid + ')');
 			user_module.logout(req.sessionID, function(logout) {
 				req.logout();
-				res.send(build_header() + templates['logout'] + templates['footer']);
+				res.send(app.build_header() + templates['logout'] + templates['footer']);
 			});
 		});
 
@@ -126,11 +120,11 @@
 
 
 		app.get('/reset/:code', function(req, res) {
-			res.send(build_header() + templates['reset_code'].parse({ reset_code: req.params.code }) + templates['footer']);
+			res.send(app.build_header() + templates['reset_code'].parse({ reset_code: req.params.code }) + templates['footer']);
 		});
 
 		app.get('/reset', function(req, res) {
-			res.send(build_header() + templates['reset'] + templates['footer']);
+			res.send(app.build_header() + templates['reset'] + templates['footer']);
 		});
 
 
diff --git a/src/routes/user.js b/src/routes/user.js
index 19cf0cab4f..2a55ee9b4c 100644
--- a/src/routes/user.js
+++ b/src/routes/user.js
@@ -7,12 +7,6 @@ var user = require('./../user.js'),
 
 (function(User) {
 	User.create_routes = function(app) {
-		var build_header = function() {
-				return templates['header'].parse({
-					cssSrc: global.config['theme:src'] || '/vendor/bootstrap/css/bootstrap.min.css',
-					title: global.config['title'] || 'NodeBB'
-				});
-			};
 		
 		app.get('/uid/:uid', function(req, res) {
 		
@@ -29,8 +23,9 @@ var user = require('./../user.js'),
 		});
 
 		app.get('/users', function(req, res) {
+			console.log('derp');
 			user.getUserList(function(data) {
-				res.send(build_header() + app.create_route("users", "users") + templates['footer']);
+				res.send(app.build_header() + app.create_route("users", "users") + templates['footer']);
 			});
 		});
 
@@ -48,7 +43,7 @@ var user = require('./../user.js'),
 				
 				user.getUserData(uid, function(data) {
 					if(data) {
-						res.send(build_header() + app.create_route('users/'+data.username, 'account')  + templates['footer']);
+						res.send(app.build_header() + app.create_route('users/'+data.username, 'account')  + templates['footer']);
 					}
 					else {
 						res.redirect('/404');
@@ -65,7 +60,7 @@ var user = require('./../user.js'),
 			user.getUserField(req.user.uid, 'username', function(username) {
 			
 				if(req.params.username && username === req.params.username)
-					res.send(build_header() + app.create_route('users/'+req.params.username+'/edit','accountedit') + templates['footer']);
+					res.send(app.build_header() + app.create_route('users/'+req.params.username+'/edit','accountedit') + templates['footer']);
 				else
 					return res.redirect('/404');
 			});	
@@ -228,7 +223,7 @@ var user = require('./../user.js'),
 			if(!req.user)
 				return res.redirect('/403');
 			
-			res.send(build_header() + app.create_route('users/'+req.params.username+'/following','following') + templates['footer']);
+			res.send(app.build_header() + app.create_route('users/'+req.params.username+'/following','following') + templates['footer']);
 		});
 		
 		app.get('/users/:username/followers', function(req, res) {
@@ -236,11 +231,11 @@ var user = require('./../user.js'),
 			if(!req.user)
 				return res.redirect('/403');
 			
-			res.send(build_header() + app.create_route('users/'+req.params.username+'/followers','followers') + templates['footer']);
+			res.send(app.build_header() + app.create_route('users/'+req.params.username+'/followers','followers') + templates['footer']);
 		});
 
 		function api_method(req, res) {
-			
+			console.log('derp');
 			var callerUID = req.user?req.user.uid : 0;
 	
 			if (!req.params.section && !req.params.username) {
diff --git a/src/user.js b/src/user.js
index e26fdd7855..887263cba9 100644
--- a/src/user.js
+++ b/src/user.js
@@ -126,8 +126,14 @@ var utils = require('./../public/src/utils.js'),
 				userkeys.splice(anonUserIndex, 1);
 			}
 
+			// removes user:1:following and user:1:followers, - need to find a better way for this
+			userkeys = userkeys.filter(function(value, index, self){
+				return value.indexOf(':f') === -1;
+			});
+
 			for(var i=0,ii=userkeys.length; i<ii; ++i) {
 				var uid = userkeys[i].substr(5);
+				
 				User.getUserData(uid, function(userData) {
 					data.push(userData);
 					if(data.length == userkeys.length)
diff --git a/src/webserver.js b/src/webserver.js
index 88cd8fd756..80712aeb9f 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -21,13 +21,14 @@ var express = require('express'),
 	meta = require('./meta.js');
 
 (function(app) {
-	var templates = null,
-		build_header = function() {
-			return templates['header'].parse({
-				cssSrc: global.config['theme:src'] || '/vendor/bootstrap/css/bootstrap.min.css',
-				title: global.config['title'] || 'NodeBB'
-			});
-		};
+	var templates = null;
+	
+	app.build_header = function() {
+		return templates['header'].parse({
+			cssSrc: global.config['theme:src'] || '/vendor/bootstrap/css/bootstrap.min.css',
+			title: global.config['title'] || 'NodeBB'
+		});
+	};
 
 	// Middlewares
 	app.use(express.favicon());	// 2 args: string path and object options (i.e. expire time etc)
@@ -93,7 +94,7 @@ var express = require('express'),
 						return;
 					}
 					
-					res.send(build_header() + app.create_route(route) + templates['footer']);
+					res.send(app.build_header() + app.create_route(route) + templates['footer']);
 				});
 			}(routes[i]));
 		}
@@ -103,7 +104,7 @@ var express = require('express'),
 	app.get('/', function(req, res) {
 		categories.getAllCategories(function(returnData) {
 			res.send(
-				build_header() +
+				app.build_header() +
 				'\n\t<noscript>\n' + templates['noscript/header'] + templates['noscript/home'].parse(returnData) + '\n\t</noscript>' +
 				app.create_route('') +
 				templates['footer']
@@ -131,7 +132,7 @@ var express = require('express'),
 		var topic_url = tid + (req.params.slug ? '/' + req.params.slug : '');
 		topics.getTopicById(tid, ((req.user) ? req.user.uid : 0), function(topic) {
 			res.send(
-				build_header() +
+				app.build_header() +
 				'\n\t<noscript>\n' + templates['noscript/header'] + templates['noscript/topic'].parse(topic) + '\n\t</noscript>' +
 				'\n\t<script>templates.ready(function(){ajaxify.go("topic/' + topic_url + '");});</script>' +
 				templates['footer']
@@ -159,7 +160,7 @@ var express = require('express'),
 		categories.getCategoryById(cid, 0, function(returnData) {
 			console.log(returnData);
 			res.send(
-				build_header() +
+				app.build_header() +
 				'\n\t<noscript>\n' + templates['noscript/header'] + templates['noscript/category'].parse(returnData) + '\n\t</noscript>' +
 				'\n\t<script>templates.ready(function(){ajaxify.go("category/' + category_url + '");});</script>' +
 				templates['footer']
@@ -168,7 +169,7 @@ var express = require('express'),
 	});
 
 	app.get('/confirm/:code', function(req, res) {
-		res.send(build_header() + '<script>templates.ready(function(){ajaxify.go("confirm/' + req.params.code + '");});</script>' + templates['footer']);
+		res.send(app.build_header() + '<script>templates.ready(function(){ajaxify.go("confirm/' + req.params.code + '");});</script>' + templates['footer']);
 	});
 	
 	// These functions are called via ajax once the initial page is loaded to populate templates with data