From 65521d9e43a2179d4ecc99e385fcd5f881d80107 Mon Sep 17 00:00:00 2001
From: Alexey Sokolov <alexey+znc@asokolov.org>
Date: Thu, 4 Feb 2016 23:17:26 +0000
Subject: [PATCH 1/2] webadmin: Fix error message on invalid user.

Calling PrintErrorPage twice doesn't work very well.

See #1163
---
 modules/webadmin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp
index 639be021..64ab6735 100644
--- a/modules/webadmin.cpp
+++ b/modules/webadmin.cpp
@@ -1454,7 +1454,7 @@ public:
 
 		CUser* pNewUser = GetNewUser(WebSock, pUser);
 		if (!pNewUser) {
-			WebSock.PrintErrorPage("Invalid user settings");
+			// GetNewUser already called WebSock.PrintErrorPage()
 			return true;
 		}
 

From 13ce4e3a1eb41200b99b5ae36dca18adda13e02f Mon Sep 17 00:00:00 2001
From: Alexey Sokolov <alexey+znc@asokolov.org>
Date: Thu, 4 Feb 2016 23:39:49 +0000
Subject: [PATCH 2/2] webadmin: Don't autocomplete password in user settings
 even in Firefox

Fix #1163
---
 modules/data/webadmin/tmpl/add_edit_user.tmpl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/data/webadmin/tmpl/add_edit_user.tmpl b/modules/data/webadmin/tmpl/add_edit_user.tmpl
index b05bfcf7..ab71c7f1 100644
--- a/modules/data/webadmin/tmpl/add_edit_user.tmpl
+++ b/modules/data/webadmin/tmpl/add_edit_user.tmpl
@@ -6,6 +6,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">