diff --git a/npm_install.py b/npm_install.py
index 6847443..9089293 100644
--- a/npm_install.py
+++ b/npm_install.py
@@ -2008,7 +2008,10 @@ def print_summary(info, ipv6_enabled, dark_enabled, tp_theme, update_mode):
         "Paths:            /opt/npm (app), /data (data), /etc/angie (conf), /var/log/angie (logs)"
     )
     print("Services:         systemctl status angie.service / npm.service")
-    print("Default login:    Email: admin@example.com   Password: changeme")
+
+    if not update_mode:
+        print("Default login:    Email: admin@example.com   Password: changeme")
+
     print("Test config:      /usr/sbin/angie -t")
     print("==========================================================\n")
 
@@ -2314,13 +2317,13 @@ def main():
             node_pkg=args.nodejs_pkg,
             node_version=args.node_version,
             npm_version_override=args.npm_version,
-            apply_dark=args.dark_mode,
+            apply_dark=args.dark_mode or bool(selected_theme),
             dark_env=dict(
                 APP_FILEPATH="/opt/npm/frontend",
                 TP_DOMAIN=TP_DOMAIN,
                 TP_COMMUNITY_THEME=TP_COMMUNITY_THEME,
                 TP_SCHEME=TP_SCHEME,
-                TP_THEME=args.tp_theme,
+                TP_THEME=selected_theme,
             ),
             ipv6_enabled=stored_ipv6 if 'stored_ipv6' in locals() else args.enable_ipv6,
         )