diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl
index b683a719b2..25c48d99ac 100644
--- a/public/templates/topic.tpl
+++ b/public/templates/topic.tpl
@@ -18,7 +18,7 @@
 		<div class="post-block">
 			<div id="content_{posts.pid}" class="post-content">{posts.content}</div>
 			<div class="profile-block">
-				<img class="hidden-desktop" src="{posts.gravatar}10" align="left" /> posted by <strong>{posts.username}</strong> {posts.relativeTime} ago
+				<img class="hidden-desktop" src="{posts.gravatar}10" align="left" /> posted by <strong><a href="/users/{posts.uid}">{posts.username}</a></strong>    {posts.relativeTime} ago
 				<span class="post-buttons">
 					<div id="ids_{posts.pid}_{posts.uid}" class="edit {posts.display_moderator_tools} hidden-phone"><i class="icon-pencil"></i></div>
 					<div id="ids_{posts.pid}_{posts.uid}" class="delete {posts.display_moderator_tools} hidden-phone"><i class="icon-trash"></i></div>
@@ -65,7 +65,7 @@
 				usercount = usernames.length;
 
 			for (var i = 0, ii=usercount; i<ii; i++) {
-				usernames[i] = '<strong>' + usernames[i] + '</strong>';
+				usernames[i] = '<strong>' + '<a href="/users/'+users.uids[i]+'">' + usernames[i] + '</a></strong>';
 			}
 
 			// headexplosion.gif for fun, to see if I could do this in one line of code. feel free to refactor haha
diff --git a/src/webserver.js b/src/webserver.js
index d74ebc9467..e646511ed3 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -317,13 +317,21 @@ passport.deserializeUser(function(uid, done) {
 
  		if (req.user === undefined) 
  			return res.redirect('/403');
+	
+		var requestedUserId = req.user.uid;
 
-		user.getUserData(req.user.uid, function(data) {
+		if(req.params.id != req.user.uid)
+			requestedUserId = req.params.id;
 
-			data.joindate = utils.relativeTime(data.joindate);
-			
-			var userData = {user:data};
-			callback(userData);
+		user.getUserData(requestedUserId, function(data) {
+			if(data)
+			{
+				data.joindate = utils.relativeTime(data.joindate);
+				
+				callback({user:data});
+			}
+			else
+				callback({user:{}});
 		});
 	}