diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js
index a5a79e6bc2..c5453595a6 100644
--- a/public/src/forum/topic.js
+++ b/public/src/forum/topic.js
@@ -246,11 +246,12 @@
 		
 	});
 
-	socket.on('chatMessage', function(data){
+	socket.on('chatMessage', function(data) {
 		
 		var username = data.username;
 		var fromuid = data.fromuid;
 		var message = data.message;
+		
 		require(['chat'], function(chat) {
 			var chatModal = chat.createModalIfDoesntExist(username, fromuid);
 			chatModal.show();
diff --git a/src/user.js b/src/user.js
index 936e1f63b0..a666f2720e 100644
--- a/src/user.js
+++ b/src/user.js
@@ -42,7 +42,7 @@ var utils = require('./../public/src/utils.js'),
 		}
 
 		var uuids = uids.filter(function(value, index, self) { 
-		    return self.indexOf(value) === index;
+			return self.indexOf(value) === index;
 		});
 
 		var data = {},
@@ -64,10 +64,14 @@ var utils = require('./../public/src/utils.js'),
 		RDB.hgetall('user:'+uid, function(err, data){
 			if(err === null)
 			{
-				if(data && data['password'])
-					delete data['password'];
-				data.uid = uid;
-				callback(data);
+				if(data) {
+					if(data['password'])
+						delete data['password'];
+					data.uid = uid;
+					callback(data);
+				}
+				else
+					callback({});
 			}
 			else
 				console.log(err);