diff --git a/static/webui/index.html b/static/webui/index.html
index c5fc1310..dd87127a 100644
--- a/static/webui/index.html
+++ b/static/webui/index.html
@@ -34,7 +34,7 @@
                         <li><a class="dropdown-item" href="#" data-lang="th" onclick="event.preventDefault();setLanguage('th');">แบบไทย</a></li>
                     </ul>
                 </li>
-                <li class="nav-item dropdown">
+                <li class="nav-item dropdown user-dropdown">
                     <button class="nav-link dropdown-toggle displayname" data-bs-toggle="dropdown" aria-expanded="false"></button>
                     <ul class="dropdown-menu dropdown-menu-end">
                         <li><a class="dropdown-item" href="/webui/" onclick="logout();" data-loc="navbar_logout"></a></li>
diff --git a/static/webui/script.js b/static/webui/script.js
index 45f8c9e8..6507d736 100644
--- a/static/webui/script.js
+++ b/static/webui/script.js
@@ -141,8 +141,10 @@ setActiveLanguage(localStorage.getItem("lang") ?? "en");
 function setLanguage(lang) {
     setActiveLanguage(lang);
     localStorage.setItem("lang", lang);
-    fetchItemList();
-    updateInventory();
+    if (window.authz) { // Not in prelogin state?
+        fetchItemList();
+        updateInventory();
+    }
 }
 
 let uniqueLevelCaps = {};
diff --git a/static/webui/style.css b/static/webui/style.css
index fbd3a65d..04379911 100644
--- a/static/webui/style.css
+++ b/static/webui/style.css
@@ -14,9 +14,7 @@
     }
 }
 
-body:not(.logged-in) .navbar-toggler,
-body:not(.logged-in) .nav-item.dropdown,
-body:not(.logged-in) #refresh-note {
+body:not(.logged-in) .user-dropdown {
     display: none;
 }