diff --git a/daemon.py b/daemon.py
index 989331b35..58dafb3c2 100644
--- a/daemon.py
+++ b/daemon.py
@@ -13296,7 +13296,8 @@ class PubServer(BaseHTTPRequestHandler):
                             self.server.baseDir,
                             self.server.httpPrefix,
                             self.server.domainFull,
-                            self.server.systemLanguage).encode('utf-8')
+                            self.server.systemLanguage,
+                            True).encode('utf-8')
             msglen = len(msg)
             self._login_headers('text/html', msglen, callingDomain)
             self._write(msg)
diff --git a/webapp_login.py b/webapp_login.py
index d4306bcb5..97e54811c 100644
--- a/webapp_login.py
+++ b/webapp_login.py
@@ -57,7 +57,7 @@ def htmlLogin(cssCache: {}, translate: {},
               baseDir: str,
               httpPrefix: str, domain: str,
               systemLanguage: str,
-              autocomplete: bool = True) -> str:
+              autocomplete: bool) -> str:
     """Shows the login screen
     """
     accounts = noOfAccounts(baseDir)
@@ -146,8 +146,8 @@ def htmlLogin(cssCache: {}, translate: {},
     autocompleteNicknameStr = 'autocomplete="username"'
     autocompletePasswordStr = 'autocomplete="current-password"'
     if not autocomplete:
-        autocompleteNicknameStr = 'autocomplete="off" value=""'
-        autocompletePasswordStr = autocompleteNicknameStr
+        autocompleteNicknameStr = 'autocomplete="username" value=""'
+        autocompletePasswordStr = 'autocomplete="off" value=""'
 
     instanceTitle = \
         getConfigParam(baseDir, 'instanceTitle')