diff --git a/public/templates/account.tpl b/public/templates/account.tpl
index faee1a8f33..2b1ce5b327 100644
--- a/public/templates/account.tpl
+++ b/public/templates/account.tpl
@@ -18,6 +18,10 @@
 	<span>Member for </span>
 	<span id="membersince">{user.joindate}</span>
 	<br/>
+	
+	<span>Reputation </span>
+	<span id="membersince">{user.reputation}</span>
+	<br/>
 
 
 	<!-- END user -->
diff --git a/src/user.js b/src/user.js
index b47140708e..6cdf65414b 100644
--- a/src/user.js
+++ b/src/user.js
@@ -39,7 +39,8 @@ var	config = require('../config.js'),
 		RDB.db.hgetall(String(uid), function(err, data){
 			if(err === null)
 			{
-				delete data['password'];
+				if(data && data['password'])
+					delete data['password'];
 				callback(data);
 			}
 			else
diff --git a/src/webserver.js b/src/webserver.js
index f77ac66a21..e3833a33f2 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -315,7 +315,10 @@ passport.deserializeUser(function(uid, done) {
 			return res.redirect('/403');
 		
 		user.getUserData(req.params.uid, function(data){
-			res.send(data);
+			if(data)
+				res.send(data);
+			else
+				res.send("User doesn't exist!");
 		});
 		
 	});