diff --git a/public/src/templates.js b/public/src/templates.js
index 8ab24d7fc9..ee900c66c5 100644
--- a/public/src/templates.js
+++ b/public/src/templates.js
@@ -49,7 +49,7 @@ var templates = {};
 
 	function init() {
 		loadTemplates([
-			'header', 'footer', 'register', 'home', 'topic',
+			'header', 'footer', 'register', 'home', 'topic','account',
 			'login', 'reset', 'reset_code', 'account',
 			'confirm',
 			'emails/reset', 'emails/reset_plaintext', 'emails/email_confirm', 'emails/email_confirm_plaintext'
diff --git a/public/templates/footer.tpl b/public/templates/footer.tpl
index d2aeec4081..e6ca609cf3 100644
--- a/public/templates/footer.tpl
+++ b/public/templates/footer.tpl
@@ -56,7 +56,7 @@
 				logoutEl.innerHTML = '<a href="/logout">Log out</a>';
 
 				name.innerHTML = data['username'];
-				gravatar.src = data['picture'];
+				gravatar.src = data['picture']+"?s=24";
 
 				user_label.innerHTML = '';
 				user_label.appendChild(gravatar);
diff --git a/src/user.js b/src/user.js
index c244320b0d..e25695be40 100644
--- a/src/user.js
+++ b/src/user.js
@@ -38,7 +38,10 @@ var	config = require('../config.js'),
 
 		RDB.db.hgetall(String(uid), function(err, data){
 			if(err === null)
+			{
+				delete data['password'];
 				callback(data);
+			}
 			else
 				console.log(err);
 		});
@@ -386,7 +389,7 @@ var	config = require('../config.js'),
 	}
 
 	User.get_uid_by_email = function(email, callback) {
-		RDB.get('email:' + email+':uid', callback)
+		RDB.get('email:' + email + ':uid', callback)
 	};
 
 	User.get_uid_by_session = function(session, callback) {
diff --git a/src/webserver.js b/src/webserver.js
index 0f84865394..f77ac66a21 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -286,9 +286,6 @@ passport.deserializeUser(function(uid, done) {
 			console.log("I GOT "+JSON.stringify(data));
 			
 		});
-		
-		
-		
 	});
 
 	app.get('/account', function(req, res) {
@@ -310,7 +307,16 @@ passport.deserializeUser(function(uid, done) {
 			
 			res.send(templates['header'] + account + templates['footer']);
 		});
+	});
+	
+	app.get('/uid/:uid', function(req, res) {
 		
+		if(!req.params.uid)
+			return res.redirect('/403');
+		
+		user.getUserData(req.params.uid, function(data){
+			res.send(data);
+		});
 		
 	});
 
diff --git a/src/websockets.js b/src/websockets.js
index 3159d4aba9..1cf7a6c324 100644
--- a/src/websockets.js
+++ b/src/websockets.js
@@ -53,11 +53,11 @@ var	SocketIO = require('socket.io').listen(global.server,{log:false}),
 			modules.templates.init();
 		}
 		
-		process.on('uncaughtException', function(err) {
+		/*process.on('uncaughtException', function(err) {
     		// handle the error safely
     		console.log("error message "+err);
     		socket.emit('event:consolelog',{type:'uncaughtException', stack:err.stack, error:err.toString()});
-		});
+		});*/
 
 		socket.emit('event:connect', {status: 1});
 		
@@ -71,6 +71,8 @@ var	SocketIO = require('socket.io').listen(global.server,{log:false}),
 		
 
 		socket.on('event:enter_room', function(data) {
+			return;
+			
 			if (data.leave !== null) socket.leave (data.leave);
 			socket.join(data.enter);