diff --git a/main/admin/user_edit.php b/main/admin/user_edit.php
index c9d508c967..c1f41ed18c 100644
--- a/main/admin/user_edit.php
+++ b/main/admin/user_edit.php
@@ -20,7 +20,7 @@ $user_id = isset($_GET['user_id']) ? intval($_GET['user_id']) : intval($_POST['u
 api_protect_super_admin($user_id);
 
 $htmlHeadXtra[] = '
-<script type="text/javascript">
+<script>
 <!--
 function enable_expiration_date() { //v2.0
 	document.user_edit.radio_expiration_date[0].checked=false;
@@ -348,14 +348,13 @@ if ( $form->validate()) {
 			}
 		}
 
-		$extras = array();
-		foreach($user as $key => $value) {
+		foreach ($user as $key => $value) {
 			if(substr($key, 0, 6) == 'extra_') { //an extra field
-				$myres = UserManager::update_extra_field_value($user_id, substr($key, 6), $value);
+				UserManager::update_extra_field_value($user_id, substr($key, 6), $value);
 			}
 		}
 
-		if (!empty ($email) && $send_mail) {
+		if (!empty($email) && $send_mail) {
 			$recipient_name = api_get_person_name($firstname, $lastname, null, PERSON_NAME_EMAIL_ADDRESS);
 			$emailsubject = '['.api_get_setting('siteName').'] '.get_lang('YourReg').' '.api_get_setting('siteName');
 			$sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
@@ -370,7 +369,7 @@ if ( $form->validate()) {
 			} else {
 				$emailbody=get_lang('Dear')." ".stripslashes(api_get_person_name($firstname, $lastname)).",\n\n".get_lang('YouAreReg')." ". api_get_setting('siteName') ." ".get_lang('WithTheFollowingSettings')."\n\n".get_lang('Username')." : ". $username . (($reset_password > 0) ? "\n". get_lang('Pass')." : ".stripslashes($password) : "") . "\n\n" .get_lang('Address') ." ". api_get_setting('siteName') ." ". get_lang('Is') ." : ". $_configuration['root_web'] ."\n\n". get_lang('Problem'). "\n\n". get_lang('Formula').",\n\n".api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n". get_lang('Manager'). " ".api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n" .get_lang('Email') ." : ".api_get_setting('emailAdministrator');
 			}
-			@api_mail($recipient_name, $email, $emailsubject, $emailbody, $sender_name, $email_admin);
+			@api_mail_html($recipient_name, $email, $emailsubject, $emailbody, $sender_name, $email_admin);
 		}
 		$tok = Security::get_token();
 		header('Location: user_list.php?action=show_message&message='.urlencode(get_lang('UserUpdated')).'&sec_token='.$tok);