diff --git a/public/css/style.less b/public/css/style.less
index f8f1be7389..bdae602a3d 100644
--- a/public/css/style.less
+++ b/public/css/style.less
@@ -281,12 +281,12 @@ footer.footer {
 
 .account-picture-block{
     display:inline-block;
+    margin-right:20px;
 }
 
 .account-bio-block{
   display:inline-block;
   vertical-align:top;
-  margin-left:20px;
 }
 
 .account-bio-label{
diff --git a/src/webserver.js b/src/webserver.js
index c08190096d..50faa63fe0 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -128,7 +128,14 @@ passport.deserializeUser(function(uid, done) {
 
 		for (var i=0, ii=routes.length; i<ii; i++) {
 			(function(route) {
+				
 				app.get('/' + route, function(req, res) {
+					
+					if ((route === 'login' || route ==='register') && (req.user && req.user.uid > 0)) {
+						res.redirect('/account');
+						return;
+					}
+					
 					res.send(templates['header'] + '<script>templates.ready(function(){ajaxify.go("' + route + '");});</script>' + templates['footer']);
 				});
 			}(routes[i]));