diff --git a/daemon.py b/daemon.py
index 023790a9c..3ef9c713c 100644
--- a/daemon.py
+++ b/daemon.py
@@ -10572,7 +10572,11 @@ class PubServer(BaseHTTPRequestHandler):
msg = \
htmlLogin(self.server.cssCache,
self.server.translate,
- self.server.baseDir, False).encode('utf-8')
+ self.server.baseDir,
+ self.server.httpPrefix,
+ self.server.domainFull,
+ self.server.systemLanguage,
+ False).encode('utf-8')
msglen = len(msg)
self._logout_headers('text/html', msglen, callingDomain)
self._write(msg)
@@ -11677,7 +11681,10 @@ class PubServer(BaseHTTPRequestHandler):
# request basic auth
msg = htmlLogin(self.server.cssCache,
self.server.translate,
- self.server.baseDir).encode('utf-8')
+ self.server.baseDir,
+ self.server.httpPrefix,
+ self.server.domainFull,
+ self.server.systemLanguage).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 9e5fa6206..c549d75f4 100644
--- a/webapp_login.py
+++ b/webapp_login.py
@@ -11,7 +11,7 @@ import time
from shutil import copyfile
from utils import getConfigParam
from utils import noOfAccounts
-from webapp_utils import htmlHeaderWithExternalStyle
+from webapp_utils import htmlHeaderWithWebsiteMarkup
from webapp_utils import htmlFooter
from webapp_utils import htmlKeyboardNavigation
from theme import getTextModeLogo
@@ -51,7 +51,10 @@ def htmlGetLoginCredentials(loginParams: str,
def htmlLogin(cssCache: {}, translate: {},
- baseDir: str, autocomplete=True) -> str:
+ baseDir: str,
+ httpPrefix: str, domain: str,
+ systemLanguage: str,
+ autocomplete=True) -> str:
"""Shows the login screen
"""
accounts = noOfAccounts(baseDir)
@@ -145,7 +148,10 @@ def htmlLogin(cssCache: {}, translate: {},
instanceTitle = \
getConfigParam(baseDir, 'instanceTitle')
- loginForm = htmlHeaderWithExternalStyle(cssFilename, instanceTitle)
+ loginForm = \
+ htmlHeaderWithWebsiteMarkup(cssFilename, instanceTitle,
+ httpPrefix, domain,
+ systemLanguage)
loginForm += '
\n'
loginForm += '