diff --git a/packages/api/src/auth/authProvider.js b/packages/api/src/auth/authProvider.js
index 8d4b4c93f..ab8b6ea3b 100644
--- a/packages/api/src/auth/authProvider.js
+++ b/packages/api/src/auth/authProvider.js
@@ -9,7 +9,7 @@ const jwt = require('jsonwebtoken');
 const logger = getLogger('authProvider');
 
 class AuthProviderBase {
-  async login(login, password) {
+  async login(login, password, options = undefined) {
     return {};
   }
 
diff --git a/packages/api/src/controllers/auth.js b/packages/api/src/controllers/auth.js
index 53facc759..1193dc435 100644
--- a/packages/api/src/controllers/auth.js
+++ b/packages/api/src/controllers/auth.js
@@ -27,6 +27,8 @@ function authMiddleware(req, res, next) {
     '/auth/login',
     '/stream',
     'storage/get-connections-for-login-page',
+    '/connections/dblogin',
+    '/connections/dblogin-auth',
   ];
 
   // console.log('********************* getAuthProvider()', getAuthProvider());
diff --git a/packages/api/src/controllers/connections.js b/packages/api/src/controllers/connections.js
index 5a80a972b..eae4688fe 100644
--- a/packages/api/src/controllers/connections.js
+++ b/packages/api/src/controllers/connections.js
@@ -17,6 +17,7 @@ const platformInfo = require('../utility/platformInfo');
 const { connectionHasPermission, testConnectionPermission } = require('../utility/hasPermission');
 const pipeForkLogs = require('../utility/pipeForkLogs');
 const requireEngineDriver = require('../utility/requireEngineDriver');
+const { getAuthProvider } = require('../auth/authProvider');
 
 const logger = getLogger('connections');
 
@@ -410,4 +411,14 @@ module.exports = {
       return { error: err.message };
     }
   },
+
+  dbloginAuth_meta: true,
+  async dbloginAuth({ conid, user, password }) {
+    const saveResp = await this.saveVolatile({ conid, user, password, test: true });
+    if (saveResp.msgtype == 'connected') {
+      const loginResp = await getAuthProvider().login(user, password, { conid: saveResp._id });
+      return loginResp;
+    }
+    return saveResp;
+  },
 };
diff --git a/packages/web/src/LoginPage.svelte b/packages/web/src/LoginPage.svelte
index 7a29626e3..6d75ad057 100644
--- a/packages/web/src/LoginPage.svelte
+++ b/packages/web/src/LoginPage.svelte
@@ -1,30 +1,36 @@
 <script lang="ts">
   import { onMount } from 'svelte';
   import { internalRedirectTo } from './clientAuth';
-  import FormButton from './forms/FormButton.svelte';
   import FormPasswordField from './forms/FormPasswordField.svelte';
-  import FormProvider from './forms/FormProvider.svelte';
   import FormSubmit from './forms/FormSubmit.svelte';
   import FormTextField from './forms/FormTextField.svelte';
-  import { apiCall, enableApi } from './utility/api';
+  import { apiCall, enableApi, strmid } from './utility/api';
   import { useConfig } from './utility/metadataLoaders';
   import ErrorInfo from './elements/ErrorInfo.svelte';
   import FormSelectField from './forms/FormSelectField.svelte';
   import { writable } from 'svelte/store';
   import FormProviderCore from './forms/FormProviderCore.svelte';
+  import { openWebLink } from './utility/exportFileTools';
+  import FontIcon from './icons/FontIcon.svelte';
+  import createRef from './utility/createRef';
 
   export let isAdminPage;
 
   const config = useConfig();
 
   let availableConnections = null;
+  let isTesting = false;
+  const testIdRef = createRef(0);
+  let sqlConnectResult;
 
-  const values = writable({});
+  const values = writable({ databaseServer: null });
+
+  $: selectedConnection = availableConnections?.find(x => x.conid == $values.databaseServer);
 
   async function loadAvailableServers() {
     availableConnections = await apiCall('storage/get-connections-for-login-page');
     if (availableConnections?.length > 0) {
-      values.set({ databaseServer: availableConnections[0].id });
+      values.set({ databaseServer: availableConnections[0].conid });
     }
   }
 
@@ -52,47 +58,114 @@
             label="Database server"
             name="databaseServer"
             isNative
-            options={availableConnections.map(conn => ({ value: conn.id, label: conn.label }))}
+            options={availableConnections.map(conn => ({ value: conn.conid, label: conn.label }))}
           />
         {/if}
 
-        {#if !isAdminPage}
-          <FormTextField label="Username" name="login" autocomplete="username" saveOnInput />
+        {#if selectedConnection}
+          {#if selectedConnection.passwordMode == 'askUser'}
+            <FormTextField label="Username" name="login" autocomplete="username" saveOnInput />
+          {/if}
+          {#if selectedConnection.passwordMode == 'askUser' || selectedConnection.passwordMode == 'askPassword'}
+            <FormPasswordField label="Password" name="password" autocomplete="current-password" saveOnInput />
+          {/if}
+        {:else}
+          {#if !isAdminPage}
+            <FormTextField label="Username" name="login" autocomplete="username" saveOnInput />
+          {/if}
+          <FormPasswordField label="Password" name="password" autocomplete="current-password" saveOnInput />
         {/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}
 
+        {#if isTesting}
+          <div class="ml-5">
+            <FontIcon icon="icon loading" /> Testing connection
+          </div>
+        {/if}
+
+        {#if !isTesting && sqlConnectResult && sqlConnectResult.msgtype == 'error'}
+          <div class="error-result ml-5">
+            Connect failed: <FontIcon icon="img error" />
+            {sqlConnectResult.error}
+          </div>
+        {/if}
+
         <div class="submit">
-          <FormSubmit
-            value={isAdminPage ? 'Log In as Administrator' : 'Log In'}
-            on:click={async e => {
-              enableApi();
-              const resp = await apiCall('auth/login', {
-                isAdminPage,
-                ...e.detail,
-              });
-              if (resp.error) {
-                internalRedirectTo(
-                  `?page=not-logged&error=${encodeURIComponent(resp.error)}&is-admin=${isAdminPage ? 'true' : ''}`
+          {#if selectedConnection?.useRedirectDbLogin}
+            <FormSubmit
+              value="Open database login page"
+              on:click={async e => {
+                const state = `dbg-dblogin:${strmid}:${selectedConnection?.conid}`;
+                localStorage.setItem('dbloginState', state);
+                openWebLink(
+                  `connections/dblogin?conid=${selectedConnection?.conid}&state=${encodeURIComponent(state)}&redirectUri=${
+                    location.origin + location.pathname
+                  }`
                 );
-                return;
-              }
-              const { accessToken } = resp;
-              if (accessToken) {
-                localStorage.setItem(isAdminPage ? 'adminAccessToken' : 'accessToken', accessToken);
-                if (isAdminPage) {
-                  internalRedirectTo('?page=admin');
-                } else {
-                  internalRedirectTo('?');
+                // internalRedirectTo(
+                //   `connections/dblogin?conid=${selectedConnection?.conid}&state=${encodeURIComponent(state)}&redirectUri=${
+                //     location.origin + location.pathname
+                //   }`
+                // );
+              }}
+            />
+          {:else if selectedConnection}
+            <FormSubmit
+              value="Log In"
+              on:click={async e => {
+                if (selectedConnection.passwordMode == 'askUser' || selectedConnection.passwordMode == 'askPassword') {
+                  enableApi();
+                  isTesting = true;
+                  testIdRef.update(x => x + 1);
+                  const testid = testIdRef.get();
+                  const resp = await apiCall('connections/dblogin-auth', {
+                    conid: selectedConnection.conid,
+                    user: $values['login'],
+                    password: $values['password'],
+                  });
+                  if (testIdRef.get() != testid) return;
+                  isTesting = false;
+                  if (resp.accessToken) {
+                    localStorage.setItem('accessToken', resp.accessToken);
+                    internalRedirectTo('?');
+                  } else {
+                    sqlConnectResult = resp;
+                  }
                 }
-                return;
-              }
-              internalRedirectTo(`?page=not-logged`);
-            }}
-          />
+              }}
+            />
+          {:else}
+            <FormSubmit
+              value={isAdminPage ? 'Log In as Administrator' : 'Log In'}
+              on:click={async e => {
+                enableApi();
+                const resp = await apiCall('auth/login', {
+                  isAdminPage,
+                  ...e.detail,
+                });
+                if (resp.error) {
+                  internalRedirectTo(
+                    `?page=not-logged&error=${encodeURIComponent(resp.error)}&is-admin=${isAdminPage ? 'true' : ''}`
+                  );
+                  return;
+                }
+                const { accessToken } = resp;
+                if (accessToken) {
+                  localStorage.setItem(isAdminPage ? 'adminAccessToken' : 'accessToken', accessToken);
+                  if (isAdminPage) {
+                    internalRedirectTo('?page=admin');
+                  } else {
+                    internalRedirectTo('?');
+                  }
+                  return;
+                }
+                internalRedirectTo(`?page=not-logged`);
+              }}
+            />
+          {/if}
         </div>
       </FormProviderCore>
     </div>