diff --git a/services/jupyterhub/templates_enhanced/admin.html b/services/jupyterhub/templates_enhanced/admin.html
index 0fe618f..31cfbaa 100644
--- a/services/jupyterhub/templates_enhanced/admin.html
+++ b/services/jupyterhub/templates_enhanced/admin.html
@@ -79,8 +79,10 @@
 
         console.log('[Admin Fetch]', method, url);
 
-        // Check for user creation
-        const isUserCreation = method === 'POST' && url.includes('api/users') && !url.includes('?');
+        // Check for user creation - POST to api/users (may have ?_xsrf query param)
+        // Exclude URLs with other query params like include_stopped_servers
+        const urlPath = url.split('?')[0];
+        const isUserCreation = method === 'POST' && urlPath.endsWith('api/users');
 
         // Capture request body before fetch (for batch user creation)
         let requestUsernames = [];
diff --git a/services/jupyterhub/templates_enhanced/page.html b/services/jupyterhub/templates_enhanced/page.html
index 9b757f3..5f3c2b4 100644
--- a/services/jupyterhub/templates_enhanced/page.html
+++ b/services/jupyterhub/templates_enhanced/page.html
@@ -151,11 +151,11 @@
                       <a class="nav-link" href="{{ base_url }}admin">Admin</a>
                     </li>
                     <li class="nav-item">
-                      <a class="nav-link" href="{{ base_url }}hub/authorize">Authorize Users</a>
+                      <a class="nav-link" href="{{ base_url }}authorize">Authorize Users</a>
                     </li>
                   {% endif %}
                   <li class="nav-item">
-                    <a class="nav-link" href="{{ base_url }}hub/change-password">Change Password</a>
+                    <a class="nav-link" href="{{ base_url }}change-password">Change Password</a>
                   </li>
                   {% if services %}
                     <li class="nav-item dropdown">