diff --git a/daemon.py b/daemon.py
index 391d0cca1..ac6958631 100644
--- a/daemon.py
+++ b/daemon.py
@@ -16263,7 +16263,8 @@ class PubServer(BaseHTTPRequestHandler):
                                self.server.http_prefix,
                                self.server.domain_full,
                                self.server.system_language,
-                               False, ua_str).encode('utf-8')
+                               False, ua_str,
+                               self.server.theme_name).encode('utf-8')
                 msglen = len(msg)
                 self._logout_headers('text/html', msglen, calling_domain)
                 self._write(msg)
@@ -18029,7 +18030,8 @@ class PubServer(BaseHTTPRequestHandler):
                              self.server.http_prefix,
                              self.server.domain_full,
                              self.server.system_language,
-                             True, ua_str).encode('utf-8')
+                             True, ua_str,
+                             self.server.theme_name).encode('utf-8')
             msglen = len(msg)
             self._login_headers('text/html', msglen, calling_domain)
             self._write(msg)
diff --git a/theme/henge/login.png b/theme/henge/login.png
new file mode 100644
index 000000000..ad76c80bb
Binary files /dev/null and b/theme/henge/login.png differ
diff --git a/webapp_login.py b/webapp_login.py
index fe0057377..62b16e243 100644
--- a/webapp_login.py
+++ b/webapp_login.py
@@ -61,7 +61,8 @@ def html_login(translate: {},
                http_prefix: str, domain: str,
                system_language: str,
                autocomplete: bool,
-               ua_str: str) -> str:
+               ua_str: str,
+               theme_name: str) -> str:
     """Shows the login screen
     """
     accounts = no_of_accounts(base_dir)
@@ -97,7 +98,11 @@ def html_login(translate: {},
 
     if not login_image_filename:
         login_image_filename = base_dir + '/accounts/' + login_image
-        copyfile(base_dir + '/img/login.png', login_image_filename)
+        source_image = base_dir + '/img/login.png'
+        theme_image = base_dir + '/theme/' + theme_name + '/login.png'
+        if os.path.isfile(theme_image):
+            source_image = theme_image
+        copyfile(source_image, login_image_filename)
 
     text_mode_logo = get_text_mode_logo(base_dir)
     text_mode_logo_html = html_keyboard_navigation(text_mode_logo, {}, {})