diff --git a/core/users/user_edit.php b/core/users/user_edit.php
index 6bd9539a41..0c06839772 100644
--- a/core/users/user_edit.php
+++ b/core/users/user_edit.php
@@ -659,7 +659,7 @@
 	if (permission_exists('ticket_add') || permission_exists('ticket_edit')) {
 		echo button::create(['type'=>'button','label'=>$text['button-tickets'],'icon'=>'tags','style'=>'margin-right: 15px;','link'=>PROJECT_PATH.'/app/tickets/tickets.php?user_uuid='.urlencode($user_uuid)]);
 	}
-	echo button::create(['type'=>'submit','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save']]);
+	echo button::create(['type'=>'button','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save'],'onclick'=>'submit_form();']);
 	echo "	</div>\n";
 	echo "	<div style='clear: both;'></div>\n";
 	echo "</div>\n";
@@ -959,7 +959,7 @@
 			}
 			echo "</select>";
 			if ($action == 'edit') {
-				echo button::create(['type'=>'submit','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add']]);
+				echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'onclick'=>'submit_form();']);
 			}
 		}
 		unset($sql, $parameters, $groups, $field);
@@ -1054,8 +1054,8 @@
 		echo "<br><br>";
 	}
 
-//uuid generation script
 	echo "<script>\n";
+//uuid generation script
 	echo "function uuid() {\n";
 	echo "	var d = new Date().getTime();\n";
 	echo "	var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {\n";
@@ -1065,9 +1065,14 @@
 	echo "	});\n";
 	echo "	return uuid;\n";
 	echo "};\n";
+//hide password fields before submit
+	echo "	function submit_form() {\n";
+	echo "		hide_password_fields();\n";
+	echo "		$('form#frm').submit();\n";
+	echo "	}\n";
 	echo "</script>\n";
 
 //include the footer
 	require_once "resources/footer.php";
 
-?>
+?>
\ No newline at end of file