diff --git a/modules/data/webadmin/tmpl/add_edit_user.tmpl b/modules/data/webadmin/tmpl/add_edit_user.tmpl
index f3e7923f..4d42f65f 100644
--- a/modules/data/webadmin/tmpl/add_edit_user.tmpl
+++ b/modules/data/webadmin/tmpl/add_edit_user.tmpl
@@ -7,6 +7,10 @@
 	<div class="section">
 		<input type="hidden" name="submitted" value="1" />
 
+		<!-- Trick Firefox into NOT autofilling password to "change password" field. It will autofill username and password to these useless fields instead. See issue #1163 -->
+		<input name="userdummy" type="text" style="display: none"/>
+		<input name="passworddummy" type="password" style="display: none"/>
+
 		<h3>Authentication</h3>
 		<div class="sectionbg">
 			<div class="sectionbody">
diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp
index a9a303d8..f0c93a5d 100644
--- a/modules/webadmin.cpp
+++ b/modules/webadmin.cpp
@@ -1547,7 +1547,7 @@ class CWebAdminMod : public CModule {
 
         CUser* pNewUser = GetNewUser(WebSock, pUser);
         if (!pNewUser) {
-            WebSock.PrintErrorPage("Invalid user settings");
+            // GetNewUser already called WebSock.PrintErrorPage()
             return true;
         }