diff --git a/public/templates/account.tpl b/public/templates/account.tpl
index af717beadd..572b69b0a0 100644
--- a/public/templates/account.tpl
+++ b/public/templates/account.tpl
@@ -54,6 +54,10 @@
 					
 					<span class="account-bio-label">posts</span>
 					<span id='postcount'>{postcount}</span>
+					<br/>
+					
+					<span class="account-bio-label">signature</span>
+					<span id='signature'>{signature}</span>
 				</div>
 			</div>
 		</div>
diff --git a/public/templates/accountedit.tpl b/public/templates/accountedit.tpl
index 5f6ca44b15..609e6069b4 100644
--- a/public/templates/accountedit.tpl
+++ b/public/templates/accountedit.tpl
@@ -116,6 +116,13 @@
 				      <input type="text" id="inputBirthday" placeholder="mm/dd/yyyy" value="{birthday}">
 				    </div>
 				  </div>
+
+				  <div class="control-group">
+				    <label class="control-label" for="inputSignature">Signature</label>
+				    <div class="controls">
+				      <textarea id="inputSignature" placeholder="your signature" rows="5">{signature}</textarea>
+				    </div>
+				  </div>
 				 
 				 <input type="hidden" id="inputUID" value="{uid}">
 				 
@@ -227,14 +234,15 @@ $(document).ready(function() {
 	var selectedImageType = '';
     
     $('#submitBtn').on('click',function(){
-
+    	alert($('#inputSignature').val());
        var userData = {
             uid:$('#inputUID').val(),
             email:$('#inputEmail').val(),
             fullname:$('#inputFullname').val(),
             website:$('#inputWebsite').val(),
             birthday:$('#inputBirthday').val(),
-            location:$('#inputLocation').val()
+            location:$('#inputLocation').val(),
+            signature:$('#inputSignature').val(),
         };
             
 		$.post('/users/doedit',
diff --git a/src/topics.js b/src/topics.js
index 166698b239..2816609e1b 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -4,7 +4,7 @@ var	RDB = require('./redis.js'),
 	user = require('./user.js'),
 	configs = require('../config.js'),
 	categories = require('./categories.js'),
-	marked = require('marked')
+	marked = require('marked'),
 	async = require('async');
 
 marked.setOptions({
diff --git a/src/user.js b/src/user.js
index dd23660769..399f0ebb08 100644
--- a/src/user.js
+++ b/src/user.js
@@ -6,7 +6,9 @@ var config = require('../config.js'),
 	crypto = require('crypto'),
 	emailjs = require('emailjs'),
 	emailjsServer = emailjs.server.connect(config.mailer),
-	bcrypt = require('bcrypt');
+	bcrypt = require('bcrypt'),
+	marked = require('marked');
+
 
 (function(User) {
 
@@ -79,19 +81,24 @@ var config = require('../config.js'),
 
 	User.updateProfile = function(uid, data) {
 		
-		var fields = ['email', 'fullname', 'website', 'location', 'birthday'];
+		var fields = ['email', 'fullname', 'website', 'location', 'birthday', 'signature'];
 		var key = '';
 		
 		for(var i=0,ii=fields.length; i<ii; ++i) {
 			key = fields[i];
-			if(data[key] !== undefined) {
 
-				User.setUserField(uid, key, data[key]);
+			if(data[key] !== undefined) {
 				
 				if(key === 'email') {
 					User.setUserField(uid, 'gravatarpicture', User.createGravatarURLFromEmail(data[key]));
 					RDB.set('email:' + data['email'] +':uid', uid);
 				}
+				else if(key === 'signature') {
+					//sanitize sig plx - baris
+					//data[key] = marked(data[key]);
+				}
+
+				User.setUserField(uid, key, data[key]);
 			}
 		}
 	}
@@ -268,6 +275,7 @@ var config = require('../config.js'),
 					'birthday':'',
 					'website':'',
 					'email' : email,
+					'signature':'',
 					'joindate' : new Date().getTime(),
 					'picture': gravatar,
 					'gravatarpicture' : gravatar,