diff --git a/packages/web/src/LoginPage.svelte b/packages/web/src/LoginPage.svelte
index 841957d81..6b3c1ca28 100644
--- a/packages/web/src/LoginPage.svelte
+++ b/packages/web/src/LoginPage.svelte
@@ -7,9 +7,13 @@
   import FormSubmit from './forms/FormSubmit.svelte';
   import FormTextField from './forms/FormTextField.svelte';
   import { apiCall, enableApi } from './utility/api';
+  import { useConfig } from './utility/metadataLoaders';
+  import ErrorInfo from './elements/ErrorInfo.svelte';
 
   export let isAdminPage;
 
+  const config = useConfig();
+
   onMount(() => {
     const removed = document.getElementById('starting_dbgate_zero');
     if (removed) removed.remove();
@@ -30,6 +34,10 @@
         {/if}
         <FormPasswordField label="Password" name="password" autocomplete="current-password" saveOnInput />
 
+        {#if isAdminPage && $config && !$config.isAdminLoginForm}
+          <ErrorInfo message="Admin login is not configured. Please set ADMIN_PASSWORD environment variable" />
+        {/if}
+
         <div class="submit">
           <FormSubmit
             value={isAdminPage ? 'Log In as Administrator' : 'Log In'}
@@ -40,13 +48,19 @@
                 ...e.detail,
               });
               if (resp.error) {
-                internalRedirectTo(`/?page=not-logged&error=${encodeURIComponent(resp.error)}`);
+                internalRedirectTo(
+                  `/?page=not-logged&error=${encodeURIComponent(resp.error)}&is-admin=${isAdminPage ? 'true' : ''}`
+                );
                 return;
               }
               const { accessToken } = resp;
               if (accessToken) {
                 localStorage.setItem('accessToken', accessToken);
-                internalRedirectTo('/');
+                if (isAdminPage) {
+                  internalRedirectTo('/?page=admin');
+                } else {
+                  internalRedirectTo('/');
+                }
                 return;
               }
               internalRedirectTo(`/?page=not-logged`);
diff --git a/packages/web/src/NotLoggedPage.svelte b/packages/web/src/NotLoggedPage.svelte
index 0dad204f0..0dcf8bfe4 100644
--- a/packages/web/src/NotLoggedPage.svelte
+++ b/packages/web/src/NotLoggedPage.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { onMount } from 'svelte';
   import FormStyledButton from './buttons/FormStyledButton.svelte';
-  import { doLogout, redirectToLogin } from './clientAuth';
+  import { doLogout, redirectToAdminLogin, redirectToLogin } from './clientAuth';
 
   onMount(() => {
     const removed = document.getElementById('starting_dbgate_zero');
@@ -10,9 +10,14 @@
 
   const params = new URLSearchParams(location.search);
   const error = params.get('error');
+  const isAdmin = params.get('is-admin') == 'true';
 
   function handleLogin() {
-    redirectToLogin(undefined, true);
+    if (isAdmin) {
+      redirectToAdminLogin();
+    } else {
+      redirectToLogin(undefined, true);
+    }
   }
 </script>
 
diff --git a/packages/web/src/clientAuth.ts b/packages/web/src/clientAuth.ts
index 4feed074f..0ec0b4f51 100644
--- a/packages/web/src/clientAuth.ts
+++ b/packages/web/src/clientAuth.ts
@@ -41,7 +41,7 @@ export function handleOauthCallback() {
 
 export async function handleAuthOnStartup(config, isAdminPage = false) {
   if (config.isAdminLoginForm && isAdminPage) {
-    if (localStorage.getItem('adminAccessToken')) {
+    if (localStorage.getItem('accessToken')) {
       return;
     }