diff --git a/public/css/style.less b/public/css/style.less
index 22e327e34c..acf74e59b9 100644
--- a/public/css/style.less
+++ b/public/css/style.less
@@ -325,6 +325,7 @@ footer.footer {
 
 .account-username-box{
   border-bottom:1px solid #e3e3e3;
+  margin-bottom:10px;
 }
 
 .account-username{
@@ -335,6 +336,7 @@ footer.footer {
 .account-picture-block{
     display:inline-block;
     margin-right:20px;
+    vertical-align:top;
 }
 
 .account-bio-block{
@@ -348,7 +350,6 @@ footer.footer {
 }
 
 
-
 .category-icon {
 	width: 100%;
 	height: 90px;
diff --git a/public/templates/account.tpl b/public/templates/account.tpl
index 1fad9dd15a..5c859a26ad 100644
--- a/public/templates/account.tpl
+++ b/public/templates/account.tpl
@@ -9,10 +9,9 @@
 	<!-- BEGIN user -->
 	
 	<div class="account-username-box">
-		<span class="account-username">{user.username}</span>
+		<span class="account-username"><a href="/users/{user.username}">{user.username}</a></span>
 		<span class="pull-right"><a href="/users/{user.username}/edit">edit</a></span>
 	</div>
-	<br/>		
 		
 	<div class="account-picture-block">
 		<img src="{user.picture}?s=128" />
@@ -34,11 +33,7 @@
 		<span class="account-bio-label">posts</span>
 		<span id='postcount'>{user.postcount}</span>
 	</div>
-	
-	
-    <label for="email">Email Address</label><input type="text" placeholder="Enter Email Address" id="email" /><br />
-    <button class="btn btn-primary" id="reset" type="submit">Reset Password</button>
-
+	 
 
 	<!-- END user -->
 
diff --git a/public/templates/accountedit.tpl b/public/templates/accountedit.tpl
index 1e6f992487..27b9c5856f 100644
--- a/public/templates/accountedit.tpl
+++ b/public/templates/accountedit.tpl
@@ -8,12 +8,62 @@
 
     <!-- BEGIN user -->
     
-      
+    <div class="account-username-box">
+        <span class="account-username"><a href="/users/{user.username}">{user.username}</a></span>
+        <span class="pull-right"><a href="/users/{user.username}/edit">edit</a></span>
+    </div>
+    
     
-    <label for="email">Email Address</label><input type="text" placeholder="Enter Email Address" id="email" /><br />
-    <button class="btn btn-primary" id="reset" type="submit">Reset Password</button>
-
 
+    <div class="account-picture-block">
+        <img src="{user.picture}?s=128" />
+    </div>
+  
+      
+     <div class="inline-block">
+         <form class='form-horizontal'>
+             <div class="control-group">
+                <label class="control-label" for="inputEmail">Email</label>
+                <div class="controls">
+                  <input type="text" id="inputEmail" placeholder="Email" value="{user.email}">
+                </div>
+              </div>
+              
+              <div class="control-group">
+                <label class="control-label" for="inputFullname">Full Name</label>
+                <div class="controls">
+                  <input type="text" id="inputFullname" placeholder="Full Name" value="{user.fullname}">
+                </div>
+              </div>
+              
+               <div class="control-group">
+                <label class="control-label" for="inputWebsite">Website</label>
+                <div class="controls">
+                  <input type="text" id="inputWebsite" placeholder="http://website.com" value="{user.fullname}">
+                </div>
+              </div>
+             
+              <div class="control-group">
+                <label class="control-label" for="inputLocation">Location</label>
+                <div class="controls">
+                  <input type="text" id="inputLocation" placeholder="Location" value="{user.location}">
+                </div>
+              </div>
+              
+              <div class="control-group">
+                <label class="control-label" for="inputBirthday">Birthday</label>
+                <div class="controls">
+                  <input type="text" id="inputBirthday" placeholder="dd/mm/yyyy" value="{user.birthday}">
+                </div>
+              </div>
+             
+              <div class="form-actions">
+                <button type="submit" class="btn btn-primary">Save changes</button>
+                <button type="button" class="btn">Cancel</button>
+            </div>
+              
+         </form>
+    </div>
     <!-- END user -->
 
 
diff --git a/src/user.js b/src/user.js
index beeb94ff94..e17d115f32 100644
--- a/src/user.js
+++ b/src/user.js
@@ -239,6 +239,10 @@ var	config = require('../config.js'),
 
 				RDB.db.hmset('user:'+uid, {
 					'username' : username,
+					'fullname': '',
+					'location':'',
+					'birthday':'',
+					'website':'',
 					'email' : email,
 					'joindate' : new Date().getTime(),
 					'password' : hash,
diff --git a/src/webserver.js b/src/webserver.js
index c41890dcff..aeb66b3e05 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -406,10 +406,7 @@ passport.deserializeUser(function(uid, done) {
 	app.get('/users/:uid/edit', function(req, res){
 		
 		if(req.user && req.params.uid)
-		{
-			//res.send(templates['header'] + '<script>templates.ready(function(){ajaxify.go("users/' + req.params.uid+'/edit");});</script>' + templates['footer']);
 			res.send(templates['header'] + create_route('users/'+req.params.uid+'/edit','accountedit') + templates['footer']);
-		}
 		else
 			return res.redirect('/403');	
 	});