diff --git a/templates/skin/developer-jquery/actions/ActionAdmin/user_fields.tpl b/templates/skin/developer-jquery/actions/ActionAdmin/user_fields.tpl
index 1070399f..640b18a2 100644
--- a/templates/skin/developer-jquery/actions/ActionAdmin/user_fields.tpl
+++ b/templates/skin/developer-jquery/actions/ActionAdmin/user_fields.tpl
@@ -27,8 +27,8 @@
 
 <ul class="userfield-list" id="user_field_list">
 	{foreach from=$aUserFields item=oField}
-		<li id="field_{$oField->getId()}"><span class="userfield_admin_name">{$oField->getName()}</span>
-			/ <span class="userfield_admin_title">{$oField->getTitle()}</span>
+		<li id="field_{$oField->getId()}"><span class="userfield_admin_name">{$oField->getName()|escape:"html"}</span>
+			/ <span class="userfield_admin_title">{$oField->getTitle()|escape:"html"}</span>
             / <span class="userfield_admin_pattern">{$oField->getPattern()|escape:"html"}</span>
 			
 			<div class="uf-actions">
diff --git a/templates/skin/developer-jquery/actions/ActionProfile/whois.tpl b/templates/skin/developer-jquery/actions/ActionProfile/whois.tpl
index 38bf9a57..4b47f61f 100644
--- a/templates/skin/developer-jquery/actions/ActionProfile/whois.tpl
+++ b/templates/skin/developer-jquery/actions/ActionProfile/whois.tpl
@@ -85,7 +85,7 @@
                 {if count($aUserFields)}
                     {foreach from=$aUserFields item=oField}
                         <tr>
-                            <td class="var">{$oField->getTitle()}:</td>
+                            <td class="var">{$oField->getTitle()|escape:'html'}:</td>
                             <td>{$oField->getValue(true,true)}</td>
                         </tr>
                     {/foreach}
diff --git a/templates/skin/developer-jquery/actions/ActionSettings/profile.tpl b/templates/skin/developer-jquery/actions/ActionSettings/profile.tpl
index 84b34608..60e7948c 100644
--- a/templates/skin/developer-jquery/actions/ActionSettings/profile.tpl
+++ b/templates/skin/developer-jquery/actions/ActionSettings/profile.tpl
@@ -61,7 +61,7 @@
 	</p>
         {if count($aUserFields)}
             {foreach from=$aUserFields item=oField}
-                <p><label for="profile_user_field_{$oField->getId()}">{$oField->getTitle()}:</label><br /><input type="text" class="w300" name="profile_user_field_{$oField->getId()}" id="profile_user_field_{$oField->getId()}" value="{$oField->getValue()|escape:'html'}"/></p>
+                <p><label for="profile_user_field_{$oField->getId()}">{$oField->getTitle()|escape:'html'}:</label><br /><input type="text" class="w300" name="profile_user_field_{$oField->getId()}" id="profile_user_field_{$oField->getId()}" value="{$oField->getValue()|escape:'html'}"/></p>
             {/foreach}
         {/if}
 	<p>
diff --git a/templates/skin/developer-jquery/js/userfield.js b/templates/skin/developer-jquery/js/userfield.js
index 2cd853a7..514226c4 100644
--- a/templates/skin/developer-jquery/js/userfield.js
+++ b/templates/skin/developer-jquery/js/userfield.js
@@ -11,8 +11,8 @@ ls.userfield =( function ($) {
     
     this.showEditForm = function(id) {
         $('#user_fields_form_action').val('update');
-        var name = $('#field_'+id+' .userfield_admin_name').html();
-        var title = $('#field_'+id+' .userfield_admin_title').html();
+        var name = $('#field_'+id+' .userfield_admin_name').text();
+        var title = $('#field_'+id+' .userfield_admin_title').text();
         var pattern = $('#field_'+id+' .userfield_admin_pattern').text();
         $('#user_fields_form_name').val(name);
         $('#user_fields_form_title').val(title);
@@ -40,8 +40,8 @@ ls.userfield =( function ($) {
 				'<div class="uf-actions"><a href="javascript:ls.userfield.showEditForm('+data.id+')"><img src="'+DIR_STATIC_SKIN+'/images/edit.png"></a> '+
 				'<a href="javascript:ls.userfield.deleteUserfield('+data.id+')"><img src="'+DIR_STATIC_SKIN+'/images/delete.png"></a></div>';
                 $('#user_field_list').append(liElement);
-                $('#field_'+data.id+' .userfield_admin_name').html(name);
-                $('#field_'+data.id+' .userfield_admin_title').html(title);
+                $('#field_'+data.id+' .userfield_admin_name').text(name);
+                $('#field_'+data.id+' .userfield_admin_title').text(title);
                 $('#field_'+data.id+' .userfield_admin_pattern').text(pattern);
                 ls.msg.notice(data.sMsgTitle,data.sMsg);
             } else {
@@ -57,8 +57,8 @@ ls.userfield =( function ($) {
         var pattern = $('#user_fields_form_pattern').val();
         ls.ajax(aRouter['admin']+'userfields', {'action':'update', 'id':id, 'name':name,  'title':title,  'pattern':pattern}, function(data) { 
             if (!data.bStateError) {
-                $('#field_'+id+' .userfield_admin_name').html(name);
-                $('#field_'+id+' .userfield_admin_title').html(title);
+                $('#field_'+id+' .userfield_admin_name').text(name);
+                $('#field_'+id+' .userfield_admin_title').text(title);
                 $('#field_'+id+' .userfield_admin_pattern').text(pattern);
                 ls.msg.notice(data.sMsgTitle,data.sMsg);
             } else {
diff --git a/templates/skin/developer/actions/ActionAdmin/user_fields.tpl b/templates/skin/developer/actions/ActionAdmin/user_fields.tpl
index abed6563..d5196744 100644
--- a/templates/skin/developer/actions/ActionAdmin/user_fields.tpl
+++ b/templates/skin/developer/actions/ActionAdmin/user_fields.tpl
@@ -27,8 +27,8 @@
 
 <ul class="userfield-list" id="user_field_list">
 	{foreach from=$aUserFields item=oField}
-		<li id="field_{$oField->getId()}"><span class="userfield_admin_name">{$oField->getName()}</span>
-			/ <span class="userfield_admin_title">{$oField->getTitle()}</span>
+		<li id="field_{$oField->getId()}"><span class="userfield_admin_name">{$oField->getName()|escape:"html"}</span>
+			/ <span class="userfield_admin_title">{$oField->getTitle()|escape:"html"}</span>
                            / <span class="userfield_admin_pattern">{$oField->getPattern()|escape:"html"}</span>
 			
 			<div class="uf-actions">
diff --git a/templates/skin/developer/actions/ActionProfile/whois.tpl b/templates/skin/developer/actions/ActionProfile/whois.tpl
index 69b5a686..0f97cb44 100644
--- a/templates/skin/developer/actions/ActionProfile/whois.tpl
+++ b/templates/skin/developer/actions/ActionProfile/whois.tpl
@@ -85,7 +85,7 @@
                     {if count($aUserFields)}
                         {foreach from=$aUserFields item=oField}
                             <tr>
-                                <td class="var">{$oField->getTitle()}:</td>
+                                <td class="var">{$oField->getTitle()|escape:'html'}:</td>
                                 <td>{$oField->getValue(true,true)}</td>
                             </tr>
                         {/foreach}
diff --git a/templates/skin/developer/actions/ActionSettings/profile.tpl b/templates/skin/developer/actions/ActionSettings/profile.tpl
index 2402f9aa..774a511a 100644
--- a/templates/skin/developer/actions/ActionSettings/profile.tpl
+++ b/templates/skin/developer/actions/ActionSettings/profile.tpl
@@ -86,7 +86,7 @@ document.addEvent('domready', function() {
 
         {if count($aUserFields)}
             {foreach from=$aUserFields item=oField}
-                <p><label for="profile_user_field_{$oField->getId()}">{$oField->getTitle()}:</label><br /><input type="text" class="w300" name="profile_user_field_{$oField->getId()}" id="profile_user_field_{$oField->getId()}" value="{$oField->getValue()|escape:'html'}"/></p>
+                <p><label for="profile_user_field_{$oField->getId()}">{$oField->getTitle()|escape:'html'}:</label><br /><input type="text" class="w300" name="profile_user_field_{$oField->getId()}" id="profile_user_field_{$oField->getId()}" value="{$oField->getValue()|escape:'html'}"/></p>
             {/foreach}
         {/if}
 	<p>
diff --git a/templates/skin/developer/js/userfield.js b/templates/skin/developer/js/userfield.js
index 62b2659a..e625d704 100644
--- a/templates/skin/developer/js/userfield.js
+++ b/templates/skin/developer/js/userfield.js
@@ -51,14 +51,14 @@ function addUserfield() {
                     });
                     var actionsElement = new Element('div', {
                         'class':'uf-actions',
-						'html': '<a href="javascript:userfieldShowEditForm('+data.id+')"><img src="'+DIR_STATIC_SKIN+'/images/edit.gif"></a> '+
-								'<a href="javascript:deleteUserfield('+data.id+')"><img src="'+DIR_STATIC_SKIN+'/images/delete.gif"></a>'
+						'html': '<a href="javascript:userfieldShowEditForm('+data.id+')"><img src="'+DIR_STATIC_SKIN+'/images/edit.png"></a> '+
+								'<a href="javascript:deleteUserfield('+data.id+')"><img src="'+DIR_STATIC_SKIN+'/images/delete.png"></a>'
                     });
                     actionsElement.inject(liElement);
                     liElement.inject($('user_field_list'));
-                    $('field_'+id).getElement(' .userfield_admin_name').set('html', name);
-                    $('field_'+id).getElement('.userfield_admin_title').set('html', title);
-                    $('field_'+id).getElement('.userfield_admin_pattern').set('text', pattern);
+                    $('field_'+data.id).getElement(' .userfield_admin_name').set('text', name);
+                    $('field_'+data.id).getElement('.userfield_admin_title').set('text', title);
+                    $('field_'+data.id).getElement('.userfield_admin_pattern').set('text', pattern);
                     msgNoticeBox.alert(data.sMsgTitle,data.sMsg);
                 } else {
                     msgErrorBox.alert(data.sMsgTitle,data.sMsg);
@@ -77,8 +77,8 @@ function updateUserfield() {
             data: {'action':'update', 'id':id, 'name':name, 'title':title, 'pattern':pattern, 'security_ls_key':LIVESTREET_SECURITY_KEY},
             onSuccess: function(data) { // запрос выполнен уcпешно
                 if (!data.bStateError) {
-                    $('field_'+id).getElement(' .userfield_admin_name').set('html', name);
-                    $('field_'+id).getElement('.userfield_admin_title').set('html', title);
+                    $('field_'+id).getElement(' .userfield_admin_name').set('text', name);
+                    $('field_'+id).getElement('.userfield_admin_title').set('text', title);
                     $('field_'+id).getElement('.userfield_admin_pattern').set('text', pattern);
                     msgNoticeBox.alert(data.sMsgTitle,data.sMsg);
                 } else {
diff --git a/templates/skin/new/actions/ActionAdmin/user_fields.tpl b/templates/skin/new/actions/ActionAdmin/user_fields.tpl
index 0d9b0577..52767258 100755
--- a/templates/skin/new/actions/ActionAdmin/user_fields.tpl
+++ b/templates/skin/new/actions/ActionAdmin/user_fields.tpl
@@ -27,8 +27,8 @@
 
 <ul class="userfield-list" id="user_field_list">
 	{foreach from=$aUserFields item=oField}
-		<li id="field_{$oField->getId()}"><span class="userfield_admin_name">{$oField->getName()}</span>
-			/ <span class="userfield_admin_title">{$oField->getTitle()}</span>
+		<li id="field_{$oField->getId()}"><span class="userfield_admin_name">{$oField->getName()|escape:"html"}</span>
+			/ <span class="userfield_admin_title">{$oField->getTitle()|escape:"html"}</span>
                            / <span class="userfield_admin_pattern">{$oField->getPattern()|escape:"html"}</span>
 			
 			<div class="uf-actions">
diff --git a/templates/skin/new/actions/ActionProfile/whois.tpl b/templates/skin/new/actions/ActionProfile/whois.tpl
index 93c2a918..5dc752b8 100644
--- a/templates/skin/new/actions/ActionProfile/whois.tpl
+++ b/templates/skin/new/actions/ActionProfile/whois.tpl
@@ -94,7 +94,7 @@
                                                 {if count($aUserFields)}
                                                     {foreach from=$aUserFields item=oField}
                                                         <tr>
-                                                            <td class="var">{$oField->getTitle()}:</td>
+                                                            <td class="var">{$oField->getTitle()|escape:'html'}:</td>
                                                             <td>{$oField->getValue(true,true)}</td>
                                                         </tr>
                                                     {/foreach}
diff --git a/templates/skin/new/actions/ActionSettings/profile.tpl b/templates/skin/new/actions/ActionSettings/profile.tpl
index 8cdf2a33..0f71bc4a 100644
--- a/templates/skin/new/actions/ActionSettings/profile.tpl
+++ b/templates/skin/new/actions/ActionSettings/profile.tpl
@@ -85,7 +85,7 @@ document.addEvent('domready', function() {
 
                                     {if count($aUserFields)}
                                         {foreach from=$aUserFields item=oField}
-                                            <p><label for="profile_user_field_{$oField->getId()}">{$oField->getTitle()}:</label><br /><input type="text" class="w300" name="profile_user_field_{$oField->getId()}" id="profile_user_field_{$oField->getId()}" value="{$oField->getValue()|escape:'html'}"/></p>
+                                            <p><label for="profile_user_field_{$oField->getId()}">{$oField->getTitle()|escape:'html'}:</label><br /><input type="text" class="w300" name="profile_user_field_{$oField->getId()}" id="profile_user_field_{$oField->getId()}" value="{$oField->getValue()|escape:'html'}"/></p>
                                         {/foreach}
                                     {/if}
 
diff --git a/templates/skin/new/js/userfield.js b/templates/skin/new/js/userfield.js
index 62b2659a..dee760ad 100644
--- a/templates/skin/new/js/userfield.js
+++ b/templates/skin/new/js/userfield.js
@@ -56,9 +56,9 @@ function addUserfield() {
                     });
                     actionsElement.inject(liElement);
                     liElement.inject($('user_field_list'));
-                    $('field_'+id).getElement(' .userfield_admin_name').set('html', name);
-                    $('field_'+id).getElement('.userfield_admin_title').set('html', title);
-                    $('field_'+id).getElement('.userfield_admin_pattern').set('text', pattern);
+                    $('field_'+data.id).getElement(' .userfield_admin_name').set('text', name);
+                    $('field_'+data.id).getElement('.userfield_admin_title').set('text', title);
+                    $('field_'+data.id).getElement('.userfield_admin_pattern').set('text', pattern);
                     msgNoticeBox.alert(data.sMsgTitle,data.sMsg);
                 } else {
                     msgErrorBox.alert(data.sMsgTitle,data.sMsg);
@@ -77,8 +77,8 @@ function updateUserfield() {
             data: {'action':'update', 'id':id, 'name':name, 'title':title, 'pattern':pattern, 'security_ls_key':LIVESTREET_SECURITY_KEY},
             onSuccess: function(data) { // запрос выполнен уcпешно
                 if (!data.bStateError) {
-                    $('field_'+id).getElement(' .userfield_admin_name').set('html', name);
-                    $('field_'+id).getElement('.userfield_admin_title').set('html', title);
+                    $('field_'+id).getElement(' .userfield_admin_name').set('text', name);
+                    $('field_'+id).getElement('.userfield_admin_title').set('text', title);
                     $('field_'+id).getElement('.userfield_admin_pattern').set('text', pattern);
                     msgNoticeBox.alert(data.sMsgTitle,data.sMsg);
                 } else {