diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index 6bb2801fab..0d9007c3e3 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -109,6 +109,8 @@
 	#user_label img {
 		border: 1px solid #999;
 		margin-right: 8px;
+		margin-top: -2px;
+		float: left;
 	}
 
 	#user_label span {
@@ -135,7 +137,7 @@
 						<li><a href="/login">Login</a></li>
 					</ul>
 					<ul class="nav pull-right">
-						<li><p class="navbar-text" id="user_label"></p></li>
+						<li><a href="#" id="user_label"></a></li>
 						<li><a href="/logout">Log out</a></li>
 					</ul>
 				</div>
diff --git a/src/webserver.js b/src/webserver.js
index 1499a72825..c4da2ac510 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -65,6 +65,10 @@ var express = require('express'),
 		});
 	});
 
+	app.get('/403', function(req, res) {
+		res.send(templates['header'] + templates['403'] + templates['footer']);
+	});
+
 
 	// need a proper way to combine these two routes together
 	app.get('/topics/:topic_id', function(req, res) {
@@ -126,8 +130,15 @@ var express = require('express'),
 		res.send(templates['header'] + templates['account_settings'] + templates['footer']);
 	});
 
-	app.get('/403', function(req, res) {
-		res.send(templates['header'] + templates['403'] + templates['footer']);
+	app.get('/users', function(req, res) {
+		// Render user list
+		res.send('User list');
+	});
+
+	app.get('/users/:username', function(req, res) {
+		global.modules.user.get_uid_by_username(req.params.username, function(uid) {
+			res.send(templates['header'] + templates['user_profile'].parse({ uid: uid }) + templates['footer']);
+		});
 	});
 }(WebServer));