diff --git a/e107_core/templates/usersettings_template.php b/e107_core/templates/usersettings_template.php
index 543c8b53d..ffe828a5d 100755
--- a/e107_core/templates/usersettings_template.php
+++ b/e107_core/templates/usersettings_template.php
@@ -214,7 +214,7 @@ $USERSETTINGS_WRAPPER['edit']['CUSTOMTITLE'] =			"<div class='form-group'>
 														";
 
 $USERSETTINGS_WRAPPER['edit']['USERCLASSES'] = 			"<div class='form-group'>
-															<label for='userclasses' class='col-sm-3 control-label'>".LAN_USER_76.":".req($pref['signup_option_class'])."</label>
+															<label  class='col-sm-3 control-label'>".LAN_USER_76.":".req($pref['signup_option_class'])."</label>
 														       	<div class='col-sm-9'>{---}</div>
 														   </div>
 														";
@@ -256,14 +256,14 @@ $USERSETTINGS_TEMPLATE['edit'] = "
 
 
 	<div class='form-group'>
-	<label for='loginname' class='col-sm-3 control-label'>".LAN_USER_60.req(!$pref['disable_emailcheck'])."</label>
+	<label for='email' class='col-sm-3 control-label'>".LAN_USER_60.req(!$pref['disable_emailcheck'])."</label>
 	<div class='col-sm-9'>
 		{EMAIL}
 	</div>
 	</div>
 
 	<div class='form-group'>
-	<label for='loginname' class='col-sm-3 control-label'>".LAN_USER_63.req($pref['signup_option_realname'])."</label>
+	<label for='realname' class='col-sm-3 control-label'>".LAN_USER_63.req($pref['signup_option_realname'])."</label>
 	<div class='col-sm-9'>
 		{REALNAME}
 	</div>
@@ -277,14 +277,14 @@ $USERSETTINGS_TEMPLATE['edit'] = "
 
 
 	<div class='form-group'>
-	<label for='loginname' class='col-sm-3 control-label'>".LAN_USER_83."</label>
+	<label for='hideemail' class='col-sm-3 control-label'>".LAN_USER_83."</label>
 	<div class='col-sm-9'>
 	{HIDEEMAIL=radio}
 	</div>
 	</div>
 
 	<div class='form-group'>
-	<label for='loginname' class='col-sm-3 control-label'>".LAN_USER_07.req($pref['signup_option_image'])."</label>
+	<label class='col-sm-3 control-label'>".LAN_USER_07.req($pref['signup_option_image'])."</label>
 	<div class='col-sm-9'>
 	{AVATAR_REMOTE}
 	</div>
diff --git a/e107_handlers/core_functions.php b/e107_handlers/core_functions.php
index 3ce0f2b8b..22719d220 100644
--- a/e107_handlers/core_functions.php
+++ b/e107_handlers/core_functions.php
@@ -307,7 +307,7 @@ if (!function_exists('asortbyindex'))
 if (!function_exists('r_emote')) 
 {
 	/**
-	 * @DEPRECATED
+	 * Still in use.
 	 */
 	function r_emote()
 	{
@@ -331,10 +331,24 @@ if (!function_exists('r_emote'))
 			$value = ($value2 ? $value2 : $value);
 			$value = ($value == '&|') ? ':((' : $value;
 			$value = " ".$value." ";
-			//TODO CSS class
-			$str .= "\n<a href=\"javascript:addtext('$value',true)\"><img src='$key' alt='' /></a> ";
+
+		//	$str .= "\n<a class='addEmote' data-emote=\"".$value."\" href=\"javascript:addtext('$value',true)\"><img src='$key' alt='' /></a> ";
+			$str .= "\n<a class='addEmote' data-emote=\"".$value."\" href=\"#\"><img src='$key' alt='' /></a> ";
 		}
-	
+
+		$JS = "
+
+		$('.addEmote').click(function(){
+
+			val = $(this).attr('data-emote')
+			addtext(val,true);
+			return false;
+		});
+		";
+
+		e107::js('footer-inline',$JS);
+
+
 		return "<div class='spacer'>".$str."</div>";
 	}
 }
diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index ac9df3a6e..0b67a6f10 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -3198,7 +3198,10 @@ class e_parser
 		$title = (ADMIN) ? $image : $tp->toAttribute($userData['user_name']);
 		$shape = (vartrue($options['shape'])) ? "img-".$options['shape'] : "img-rounded";
 
-		$text = "<img class='".$shape." img-responsive user-avatar e-tip' title=\"".$title."\" src='".$img."' alt='' width='".$width."' height='".$height."' />";
+
+		$heightInsert = empty($height) ? '' : "height='".$height."'";
+
+		$text = "<img class='".$shape." img-responsive user-avatar e-tip' title=\"".$title."\" src='".$img."' alt='' width='".$width."' ".$heightInsert." />";
 	//	return $img;
 		return $text;
 		
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index dd16ff46a..b60b6dbd7 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -663,8 +663,8 @@ class e_form
 		
 		if($localonly == true)
 		{
-			$text = "<input class='tbox' style='width:80%' id='{$idinput}' type='hidden' name='image' size='40' value='{$curVal}' maxlength='100' />";			
-			$text .= "<img src='".$img."' id='{$previnput}' class='img-rounded e-expandit e-tip avatar' style='cursor:pointer; width:".$pref['im_width']."px; height:".$pref['im_height']."px' title='Click on the avatar to change it'/>"; // TODO LAN
+			$text = "<input class='tbox' style='width:80%' id='{$idinput}' type='hidden' name='image' value='{$curVal}'  />";
+			$text .= "<img src='".$img."' id='{$previnput}' class='img-rounded e-expandit e-tip avatar' style='cursor:pointer; width:".$pref['im_width']."px; height:".$pref['im_height']."px' title='Click on the avatar to change it' alt='Click on the avatar to change it' />"; // TODO LAN
 		}
 		else
 		{			
diff --git a/usersettings.php b/usersettings.php
index 30cac9313..1965b35f1 100644
--- a/usersettings.php
+++ b/usersettings.php
@@ -763,7 +763,7 @@ if (vartrue($_POST))
 //require_once (e_HANDLER."form_handler.php");
 //$rs = new form;
 
-$text = '<form method="post" action="'.$usersettings_form_action.'" id="dataform" class="form-horizontal" role="form" enctype="multipart/form-data" autocomplete="off">';
+$text = '<form method="post" action="'.vartrue($usersettings_form_action,e_REQUEST_URI).'" id="dataform" class="form-horizontal"  enctype="multipart/form-data" autocomplete="off">';
 
 //$text = (is_numeric($_uid) ? $rs->form_open("post", e_SELF."?".e_QUERY, "dataform", "", " class='form-horizontal' role='form' enctype='multipart/form-data'") : $rs->form_open("post", e_SELF, "dataform", "", " class='form-horizontal' role='form' enctype='multipart/form-data'"));