diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebConnectionInfo.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebConnectionInfo.java
index b57e8ed021..b4a22bb6a0 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebConnectionInfo.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebConnectionInfo.java
@@ -448,5 +448,12 @@ public int getKeepAliveInterval() {
         return dataSourceContainer.getConnectionConfiguration().getKeepAliveInterval();
     }
 
+    @Property
+    public List<WebSecretInfo> getSharedSecrets() throws DBException {
+        return dataSourceContainer.listSharedCredentials()
+            .stream()
+            .map(WebSecretInfo::new)
+            .collect(Collectors.toList());
+    }
 
 }
diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebSecretInfo.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebSecretInfo.java
new file mode 100644
index 0000000000..ee412bde07
--- /dev/null
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebSecretInfo.java
@@ -0,0 +1,38 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model;
+
+import org.jkiss.dbeaver.model.meta.Property;
+import org.jkiss.dbeaver.model.secret.DBSSecretValue;
+
+public class WebSecretInfo {
+    private final DBSSecretValue secretValue;
+
+    public WebSecretInfo(DBSSecretValue secretValue) {
+        this.secretValue = secretValue;
+    }
+
+    @Property
+    public String getDisplayName() {
+        return secretValue.getDisplayName();
+    }
+
+    @Property
+    public String getSecretId() {
+        return secretValue.getSubjectId();
+    }
+}
diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java
index d975fbe207..4f2a01b5a5 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java
@@ -1008,6 +1008,17 @@ public WebProjectImpl getProjectById(@Nullable String projectId) {
         return getWorkspace().getProjectById(projectId);
     }
 
+    public WebProjectImpl getAccessibleProjectById(@Nullable String projectId) throws DBWebException {
+        WebProjectImpl project = null;
+        if (projectId != null) {
+            project = getWorkspace().getProjectById(projectId);
+        }
+        if (project == null) {
+            throw new DBWebException("Project not found: " + projectId);
+        }
+        return project;
+    }
+
     public List<WebProjectImpl> getAccessibleProjects() {
         return getWorkspace().getProjects();
     }
diff --git a/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls b/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls
index 0b2124d5e9..e0b7e6ae7b 100644
--- a/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls
+++ b/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls
@@ -308,6 +308,11 @@ type NetworkHandlerConfig {
     secureProperties: Object!
 }
 
+type SecretInfo {
+    displayName: String!
+    secretId: String!
+}
+
 # Connection instance
 type ConnectionInfo {
     id: ID!
@@ -337,6 +342,8 @@ type ConnectionInfo {
     saveCredentials: Boolean!
     # Shared credentials - the same for all users, stored in secure storage.
     sharedCredentials: Boolean!
+
+    sharedSecrets: [SecretInfo!]! @since(version: "23.3.5")
     # Determines that credentials were saved for current user.
     # This field read is slow, it should be read only when it really needed
     credentialsSaved: Boolean!
@@ -488,6 +495,7 @@ input ConnectionConfig {
     saveCredentials: Boolean
     sharedCredentials: Boolean
     authModelId: ID
+    selectedSecretId: ID @since(version: "23.3.5")
     credentials: Object
 
     # Map of provider properties (name/value)
@@ -584,14 +592,14 @@ extend type Mutation {
     copyConnectionFromNode( nodePath: String!, config: ConnectionConfig, projectId: ID ): ConnectionInfo!
 
     # Test connection configuration. Returns remote server version
-    testConnection( config: ConnectionConfig!, projectId: ID ): ConnectionInfo!
+    testConnection( config: ConnectionConfig!, projectId: ID): ConnectionInfo!
 
     # Test connection configuration. Returns remote server version
     testNetworkHandler( config: NetworkHandlerConfigInput! ): NetworkEndpointInfo!
 
     # Initiate existing connection
     initConnection( id: ID!, projectId: ID, credentials: Object, networkCredentials: [NetworkHandlerConfigInput!],
-        saveCredentials:Boolean, sharedCredentials: Boolean ): ConnectionInfo!
+        saveCredentials:Boolean, sharedCredentials: Boolean, selectedSecretId:String ): ConnectionInfo!
 
     # Disconnect from database
     closeConnection( id: ID!, projectId: ID ): ConnectionInfo!
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebConnectionConfig.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebConnectionConfig.java
index ade7f8c719..758ece7742 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebConnectionConfig.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebConnectionConfig.java
@@ -16,6 +16,7 @@
  */
 package io.cloudbeaver.model;
 
+import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.model.connection.DBPDriverConfigurationType;
 import org.jkiss.dbeaver.model.data.json.JSONUtils;
 import org.jkiss.dbeaver.model.meta.Property;
@@ -59,6 +60,7 @@ public class WebConnectionConfig {
     private Map<String, Object> providerProperties;
     private List<WebNetworkHandlerConfigInput> networkHandlersConfig;
     private DBPDriverConfigurationType configurationType;
+    private String selectedSecretId;
 
     public WebConnectionConfig() {
     }
@@ -91,6 +93,7 @@ public WebConnectionConfig(Map<String, Object> params) {
             properties = JSONUtils.getObjectOrNull(params, "properties");
             userName = JSONUtils.getString(params, "userName");
             userPassword = JSONUtils.getString(params, "userPassword");
+            selectedSecretId = JSONUtils.getString(params, "selectedSecretId");
 
             authModelId = JSONUtils.getString(params, "authModelId");
             credentials = JSONUtils.getObjectOrNull(params, "credentials");
@@ -231,4 +234,9 @@ public Map<String, Object> getProviderProperties() {
     public Integer getKeepAliveInterval() {
         return keepAliveInterval;
     }
+
+    @Nullable
+    public String getSelectedSecretId() {
+        return selectedSecretId;
+    }
 }
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/DBWServiceCore.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/DBWServiceCore.java
index ab620fc175..65007f34b9 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/DBWServiceCore.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/DBWServiceCore.java
@@ -113,7 +113,8 @@ WebConnectionInfo initConnection(
         @NotNull Map<String, Object> authProperties,
         @Nullable List<WebNetworkHandlerConfigInput> networkCredentials,
         @Nullable Boolean saveCredentials,
-        @Nullable Boolean sharedCredentials
+        @Nullable Boolean sharedCredentials,
+        @Nullable String selectedCredentials
     ) throws DBWebException;
 
     @WebProjectAction(requireProjectPermissions = {RMConstants.PERMISSION_PROJECT_DATASOURCES_EDIT})
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/WebServiceBindingCore.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/WebServiceBindingCore.java
index 80a416f261..76f2e718cd 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/WebServiceBindingCore.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/WebServiceBindingCore.java
@@ -132,7 +132,8 @@ public void bindWiring(DBWBindingContext model) throws DBWebException {
                         env.getArgument("credentials"),
                         nhc,
                         env.getArgument("saveCredentials"),
-                        env.getArgument("sharedCredentials")
+                        env.getArgument("sharedCredentials"),
+                        env.getArgument("selectedSecretId")
                     );
                 }
             )
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java
index 2e60d03d4a..e814113d04 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java
@@ -54,6 +54,7 @@
 import org.jkiss.dbeaver.model.rm.RMProjectType;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.secret.DBSSecretController;
+import org.jkiss.dbeaver.model.secret.DBSSecretValue;
 import org.jkiss.dbeaver.model.websocket.WSConstants;
 import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceProperty;
 import org.jkiss.dbeaver.registry.DataSourceDescriptor;
@@ -318,15 +319,32 @@ public WebConnectionInfo initConnection(
         @NotNull Map<String, Object> authProperties,
         @Nullable List<WebNetworkHandlerConfigInput> networkCredentials,
         @Nullable Boolean saveCredentials,
-        @Nullable Boolean sharedCredentials
+        @Nullable Boolean sharedCredentials,
+        @Nullable String selectedSecretId
     ) throws DBWebException {
         WebConnectionInfo connectionInfo = webSession.getWebConnectionInfo(projectId, connectionId);
         connectionInfo.setSavedCredentials(authProperties, networkCredentials);
 
-        DBPDataSourceContainer dataSourceContainer = connectionInfo.getDataSourceContainer();
+        var dataSourceContainer = (DataSourceDescriptor) connectionInfo.getDataSourceContainer();
         if (dataSourceContainer.isConnected()) {
             throw new DBWebException("Datasource '" + dataSourceContainer.getName() + "' is already connected");
         }
+        if (dataSourceContainer.isSharedCredentials() && selectedSecretId != null) {
+            List<DBSSecretValue> allSecrets;
+            try {
+                allSecrets = dataSourceContainer.listSharedCredentials();
+            } catch (DBException e) {
+                throw new DBWebException("Error loading connection secret", e);
+            }
+            DBSSecretValue selectedSecret =
+                allSecrets.stream()
+                    .filter(secret -> selectedSecretId.equals(secret.getSubjectId()))
+                    .findFirst().orElse(null);
+            if (selectedSecret == null) {
+                throw new DBWebException("Secret not found:" + selectedSecretId);
+            }
+            dataSourceContainer.setSelectedSharedCredentials(selectedSecret);
+        }
 
         boolean oldSavePassword = dataSourceContainer.isSavePassword();
         try {
@@ -642,12 +660,12 @@ public WebConnectionInfo testConnection(
 
         connectionConfig.setSaveCredentials(true); // It is used in createConnectionFromConfig
 
-        DBPDataSourceContainer dataSource = WebDataSourceUtils.getLocalOrGlobalDataSource(
+        DataSourceDescriptor dataSource = (DataSourceDescriptor) WebDataSourceUtils.getLocalOrGlobalDataSource(
             CBApplication.getInstance(), webSession, projectId, connectionId);
 
         WebProjectImpl project = getProjectById(webSession, projectId);
         DBPDataSourceRegistry sessionRegistry = project.getDataSourceRegistry();
-        DBPDataSourceContainer testDataSource;
+        DataSourceDescriptor testDataSource;
         if (dataSource != null) {
             try {
                 // Check that creds are saved to trigger secrets resolve
@@ -656,12 +674,27 @@ public WebConnectionInfo testConnection(
                 throw new DBWebException("Can't determine whether datasource credentials are saved", e);
             }
 
-            testDataSource = dataSource.createCopy(dataSource.getRegistry());
+            testDataSource = (DataSourceDescriptor) dataSource.createCopy(dataSource.getRegistry());
             WebServiceUtils.setConnectionConfiguration(
                 testDataSource.getDriver(),
                 testDataSource.getConnectionConfiguration(),
                 connectionConfig
             );
+            if (connectionConfig.getSelectedSecretId() != null) {
+                try {
+                    DBSSecretValue secretValue = dataSource.listSharedCredentials()
+                        .stream()
+                        .filter(secret -> connectionConfig.getSelectedSecretId().equals(secret.getSubjectId()))
+                        .findFirst()
+                        .orElse(null);
+
+                    if (secretValue != null) {
+                        testDataSource.setSelectedSharedCredentials(secretValue);
+                    }
+                } catch (DBException e) {
+                    throw new DBWebException("Failed to load secret value: " + connectionConfig.getSelectedSecretId());
+                }
+            }
             WebServiceUtils.saveAuthProperties(
                 testDataSource,
                 testDataSource.getConnectionConfiguration(),
@@ -671,7 +704,8 @@ public WebConnectionInfo testConnection(
                 true
             );
         } else {
-            testDataSource = WebServiceUtils.createConnectionFromConfig(connectionConfig, sessionRegistry);
+            testDataSource = (DataSourceDescriptor) WebServiceUtils.createConnectionFromConfig(connectionConfig,
+                sessionRegistry);
         }
         webSession.provideAuthParameters(webSession.getProgressMonitor(), testDataSource, testDataSource.getConnectionConfiguration());
         testDataSource.setSavePassword(true); // We need for test to avoid password callback
diff --git a/webapp/packages/core-authentication/src/AppAuthService.ts b/webapp/packages/core-authentication/src/AppAuthService.ts
index 144ce9e331..bf2066c28a 100644
--- a/webapp/packages/core-authentication/src/AppAuthService.ts
+++ b/webapp/packages/core-authentication/src/AppAuthService.ts
@@ -23,8 +23,8 @@ export class AppAuthService extends Bootstrap {
 
   get loaders(): ILoadableState[] {
     return [
-      getCachedDataResourceLoaderState(this.userInfoResource, undefined),
-      getCachedDataResourceLoaderState(this.serverConfigResource, undefined),
+      getCachedDataResourceLoaderState(this.userInfoResource, () => undefined),
+      getCachedDataResourceLoaderState(this.serverConfigResource, () => undefined),
     ];
   }
 
diff --git a/webapp/packages/core-blocks/public/icons/success_sm.svg b/webapp/packages/core-blocks/public/icons/success_sm.svg
index 818bebf74f..ed6811d778 100644
--- a/webapp/packages/core-blocks/public/icons/success_sm.svg
+++ b/webapp/packages/core-blocks/public/icons/success_sm.svg
@@ -1,3 +1,3 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M16 32C24.8366 32 32 24.8366 32 16C32 7.16344 24.8366 0 16 0C7.16344 0 0 7.16344 0 16C0 24.8366 7.16344 32 16 32ZM10.9493 14.6232L9.5 16.5072L14.8623 21L22.5435 12.5942L20.8043 11L14.7174 17.8116L10.9493 14.6232Z" fill="#52C41A"/>
+<path class="icon-fill"  id="root" fill-rule="evenodd" clip-rule="evenodd" d="M16 32C24.8366 32 32 24.8366 32 16C32 7.16344 24.8366 0 16 0C7.16344 0 0 7.16344 0 16C0 24.8366 7.16344 32 16 32ZM10.9493 14.6232L9.5 16.5072L14.8623 21L22.5435 12.5942L20.8043 11L14.7174 17.8116L10.9493 14.6232Z" fill="#52C41A"/>
 </svg>
diff --git a/webapp/packages/core-blocks/src/CommonDialog/RenameDialog.tsx b/webapp/packages/core-blocks/src/CommonDialog/RenameDialog.tsx
index ef394cb054..0004d41f46 100644
--- a/webapp/packages/core-blocks/src/CommonDialog/RenameDialog.tsx
+++ b/webapp/packages/core-blocks/src/CommonDialog/RenameDialog.tsx
@@ -16,7 +16,7 @@ import { Button } from '../Button';
 import { Container } from '../Containers/Container';
 import { Fill } from '../Fill';
 import { Form } from '../FormControls/Form';
-import { InputField } from '../FormControls/InputField';
+import { InputField } from '../FormControls/InputField/InputField';
 import { useTranslate } from '../localization/useTranslate';
 import { s } from '../s';
 import { useFocus } from '../useFocus';
diff --git a/webapp/packages/core-blocks/src/Containers/Group.m.css b/webapp/packages/core-blocks/src/Containers/Group.m.css
index dae0c832fc..c2f128d261 100644
--- a/webapp/packages/core-blocks/src/Containers/Group.m.css
+++ b/webapp/packages/core-blocks/src/Containers/Group.m.css
@@ -1,6 +1,18 @@
-.group {
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+
+.secondary {
+  composes: theme-background-secondary theme-text-on-secondary from global;
+}
+.surface {
   composes: theme-background-surface theme-text-on-surface from global;
-
+}
+.group {
   align-content: baseline;
   box-sizing: border-box;
   padding: 24px;
diff --git a/webapp/packages/core-blocks/src/Containers/Group.tsx b/webapp/packages/core-blocks/src/Containers/Group.tsx
index 3bcdca638b..1f33020ae2 100644
--- a/webapp/packages/core-blocks/src/Containers/Group.tsx
+++ b/webapp/packages/core-blocks/src/Containers/Group.tsx
@@ -17,13 +17,14 @@ import elementsSizeStyles from './shared/ElementsSize.m.css';
 
 interface Props extends IContainerProps {
   form?: boolean;
+  secondary?: boolean;
   center?: boolean;
   box?: boolean;
   boxNoOverflow?: boolean;
 }
 
 export const Group = forwardRef<HTMLDivElement, Props & React.HTMLAttributes<HTMLDivElement>>(function Group(
-  { form, center, box, boxNoOverflow, className, ...rest },
+  { form, center, box, secondary, boxNoOverflow, className, ...rest },
   ref,
 ) {
   const styles = useS(style, containerStyles, elementsSizeStyles);
@@ -40,6 +41,8 @@ export const Group = forwardRef<HTMLDivElement, Props & React.HTMLAttributes<HTM
           ...containerProps,
           group: true,
           container: true,
+          secondary,
+          surface: !secondary,
           form,
           center,
           boxNoOverflow,
diff --git a/webapp/packages/core-blocks/src/Containers/shared/ElementsSize.m.css b/webapp/packages/core-blocks/src/Containers/shared/ElementsSize.m.css
index 3bac01df4c..6a5889a8e0 100644
--- a/webapp/packages/core-blocks/src/Containers/shared/ElementsSize.m.css
+++ b/webapp/packages/core-blocks/src/Containers/shared/ElementsSize.m.css
@@ -51,6 +51,7 @@
 .field.fill,
 .container.fill,
 .container > .fill {
+  flex-grow: 1;
   max-width: none;
 }
 
diff --git a/webapp/packages/core-blocks/src/ExceptionMessage.tsx b/webapp/packages/core-blocks/src/ExceptionMessage.tsx
index 77de07eb02..0a4ebdb3f8 100644
--- a/webapp/packages/core-blocks/src/ExceptionMessage.tsx
+++ b/webapp/packages/core-blocks/src/ExceptionMessage.tsx
@@ -17,7 +17,7 @@ import { useErrorDetails } from './useErrorDetails';
 import { useS } from './useS';
 
 interface Props {
-  exception?: Error;
+  exception?: Error | null;
   icon?: boolean;
   inline?: boolean;
   className?: string;
@@ -39,6 +39,10 @@ export const ExceptionMessage = observer<Props>(function ExceptionMessage({ exce
     };
   }
 
+  if (!exception) {
+    return null;
+  }
+
   return (
     <div className={s(styles, { error: true, icon, inline }, className)}>
       <div className={s(styles, { errorIcon: true })} title={error.message}>
@@ -51,7 +55,8 @@ export const ExceptionMessage = observer<Props>(function ExceptionMessage({ exce
               <span>{translate('core_blocks_exception_message_error_title')}</span>
             </h2>
             <div className={s(styles, { errorMessage: true })}>
-              {translate('core_blocks_exception_message_error_message')} {onRetry && translate('ui_please_retry')}
+              {(error.hasDetails && error.message) || translate('core_blocks_exception_message_error_message')}{' '}
+              {onRetry && translate('ui_please_retry')}
             </div>
             <div className={s(styles, { errorActions: true })}>
               <Button type="button" mod={['outlined']} disabled={error.isOpen} onClick={error.open}>
diff --git a/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.m.css b/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.m.css
index 2f466951d6..a6574dbdad 100644
--- a/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.m.css
+++ b/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.m.css
@@ -6,7 +6,6 @@
   & .fieldLabel {
     cursor: pointer;
     user-select: none;
-    padding-left: 10px;
     line-height: 16px;
   }
 }
diff --git a/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.tsx b/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.tsx
index 24f64a2d30..8b1da1d6c7 100644
--- a/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.tsx
@@ -12,6 +12,7 @@ import type { ILayoutSizeProps } from '../../Containers/ILayoutSizeProps';
 import { s } from '../../s';
 import { useS } from '../../useS';
 import { Field } from '../Field';
+import { FieldDescription } from '../FieldDescription';
 import { FieldLabel } from '../FieldLabel';
 import { isControlPresented } from '../isControlPresented';
 import { Checkbox, CheckboxBaseProps, CheckboxType, ICheckboxControlledProps, ICheckboxObjectProps } from './Checkbox';
diff --git a/webapp/packages/core-blocks/src/FormControls/Filter.tsx b/webapp/packages/core-blocks/src/FormControls/Filter.tsx
index eb0501ce21..1b7486377c 100644
--- a/webapp/packages/core-blocks/src/FormControls/Filter.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/Filter.tsx
@@ -13,7 +13,7 @@ import { s } from '../s';
 import { useFocus } from '../useFocus';
 import { useS } from '../useS';
 import filterStyle from './Filter.m.css';
-import { InputField } from './InputField';
+import { InputField } from './InputField/InputField';
 
 interface BaseProps {
   placeholder?: string;
diff --git a/webapp/packages/core-blocks/src/FormControls/IFormStateControl.ts b/webapp/packages/core-blocks/src/FormControls/IFormStateControl.ts
new file mode 100644
index 0000000000..36d263a883
--- /dev/null
+++ b/webapp/packages/core-blocks/src/FormControls/IFormStateControl.ts
@@ -0,0 +1,17 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+
+export interface IFormStateControl<TState extends Record<string, any>, TKey extends keyof TState> {
+  name: TKey;
+  state: TState;
+  defaultState?: TState;
+  autoHide?: boolean;
+  mapState?: (value: TState[TKey]) => string;
+  mapValue?: (value: string) => TState[TKey];
+  onChange?: (value: TState[TKey], name: TKey) => any;
+}
diff --git a/webapp/packages/core-blocks/src/FormControls/InputField.m.css b/webapp/packages/core-blocks/src/FormControls/InputField/InputField.m.css
similarity index 90%
rename from webapp/packages/core-blocks/src/FormControls/InputField.m.css
rename to webapp/packages/core-blocks/src/FormControls/InputField/InputField.m.css
index 5d7975f5e2..dbd08492a6 100644
--- a/webapp/packages/core-blocks/src/FormControls/InputField.m.css
+++ b/webapp/packages/core-blocks/src/FormControls/InputField/InputField.m.css
@@ -32,10 +32,13 @@
 
 .customIconContainer {
   composes: iconContainer;
-  right: 4px;
+  right: 6px;
   width: 24px;
   height: 24px;
   cursor: auto;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 
 .input[disabled] + .iconContainer {
diff --git a/webapp/packages/core-blocks/src/FormControls/InputField/InputField.tsx b/webapp/packages/core-blocks/src/FormControls/InputField/InputField.tsx
new file mode 100644
index 0000000000..f3f59d3ab5
--- /dev/null
+++ b/webapp/packages/core-blocks/src/FormControls/InputField/InputField.tsx
@@ -0,0 +1,35 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { observer } from 'mobx-react-lite';
+import React, { forwardRef, useContext } from 'react';
+
+import { useCombinedHandler } from '../../useCombinedHandler';
+import { FormContext } from '../FormContext';
+import { isFormStateControl } from '../isFormStateControl';
+import { InputFieldBase, type InputFieldBaseProps } from './InputFieldBase';
+import { InputFieldState, type InputFieldStateProps } from './InputFieldState';
+
+interface InputFieldType {
+  (props: InputFieldBaseProps): React.ReactElement<any, any> | null;
+  <TState extends Record<string, any>, TKey extends keyof TState>(props: InputFieldStateProps<TState, TKey>): React.ReactElement<any, any> | null;
+}
+
+export const InputField: InputFieldType = observer<InputFieldBaseProps | InputFieldStateProps<any, any>, HTMLInputElement>(
+  forwardRef(function InputField({ onChange, onKeyDown, ...rest }, ref) {
+    const context = useContext(FormContext);
+
+    const handleChange = useCombinedHandler(onChange, context?.change);
+    const handleKeyDown = useCombinedHandler(onKeyDown, context?.keyDown);
+
+    if (isFormStateControl(rest)) {
+      return <InputFieldState ref={ref} {...rest} onChange={handleChange} onKeyDown={handleKeyDown} />;
+    }
+
+    return <InputFieldBase ref={ref} {...rest} onChange={handleChange} onKeyDown={handleKeyDown} />;
+  }),
+) as InputFieldType;
diff --git a/webapp/packages/core-blocks/src/FormControls/InputField.tsx b/webapp/packages/core-blocks/src/FormControls/InputField/InputFieldBase.tsx
similarity index 57%
rename from webapp/packages/core-blocks/src/FormControls/InputField.tsx
rename to webapp/packages/core-blocks/src/FormControls/InputField/InputFieldBase.tsx
index f5fb97be97..471fa5e102 100644
--- a/webapp/packages/core-blocks/src/FormControls/InputField.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/InputField/InputFieldBase.tsx
@@ -6,82 +6,53 @@
  * you may not use this file except in compliance with the License.
  */
 import { observer } from 'mobx-react-lite';
-import React, { forwardRef, useCallback, useContext, useLayoutEffect, useRef, useState } from 'react';
+import React, { forwardRef, useCallback, useLayoutEffect, useRef, useState } from 'react';
 
 import { isNotNullDefined } from '@cloudbeaver/core-utils';
 
-import { filterLayoutFakeProps, getLayoutProps } from '../Containers/filterLayoutFakeProps';
-import type { ILayoutSizeProps } from '../Containers/ILayoutSizeProps';
-import { Icon } from '../Icon';
-import { Loader } from '../Loader/Loader';
-import { useTranslate } from '../localization/useTranslate';
-import { s } from '../s';
-import { useCombinedHandler } from '../useCombinedHandler';
-import { useCombinedRef } from '../useCombinedRef';
-import { useS } from '../useS';
-import { useStateDelay } from '../useStateDelay';
-import { Field } from './Field';
-import { FieldDescription } from './FieldDescription';
-import { FieldLabel } from './FieldLabel';
-import { FormContext } from './FormContext';
+import { filterLayoutFakeProps, getLayoutProps } from '../../Containers/filterLayoutFakeProps';
+import type { ILayoutSizeProps } from '../../Containers/ILayoutSizeProps';
+import { Icon } from '../../Icon';
+import { Loader } from '../../Loader/Loader';
+import { useTranslate } from '../../localization/useTranslate';
+import { s } from '../../s';
+import { useCombinedHandler } from '../../useCombinedHandler';
+import { useCombinedRef } from '../../useCombinedRef';
+import { useS } from '../../useS';
+import { useStateDelay } from '../../useStateDelay';
+import { Field } from '../Field';
+import { FieldDescription } from '../FieldDescription';
+import { FieldLabel } from '../FieldLabel';
+import { useCapsLockTracker } from '../useCapsLockTracker';
 import inputFieldStyle from './InputField.m.css';
-import { isControlPresented } from './isControlPresented';
-import { useCapsLockTracker } from './useCapsLockTracker';
 
-type BaseProps = Omit<React.InputHTMLAttributes<HTMLInputElement>, 'onChange' | 'name' | 'value' | 'style'> &
+export type InputFieldBaseProps = Omit<React.InputHTMLAttributes<HTMLInputElement>, 'value' | 'onChange' | 'style'> &
   ILayoutSizeProps & {
+    value?: string;
     error?: boolean;
     loading?: boolean;
     description?: string;
     labelTooltip?: string;
     ref?: React.ForwardedRef<HTMLInputElement>;
     canShowPassword?: boolean;
-    onCustomCopy?: () => void;
     icon?: React.ReactElement;
+    onCustomCopy?: () => void;
+    onChange?: (value: string, name?: string) => any;
   };
 
-type ControlledProps = BaseProps & {
-  name?: string;
-  value?: string | number;
-  mapState?: (value: string | number) => string | number;
-  mapValue?: (value: string | number) => string | number;
-  onChange?: (value: string | number, name?: string) => any;
-  state?: never;
-  autoHide?: never;
-};
-
-type ObjectProps<TKey extends keyof TState, TState> = BaseProps & {
-  name: TKey;
-  state: TState;
-  mapState?: (value: TState[TKey]) => TState[TKey] | string | number;
-  mapValue?: (value: TState[TKey]) => TState[TKey];
-  onChange?: (value: TState[TKey], name: TKey) => any;
-  autoHide?: boolean;
-  value?: never;
-};
-
-interface InputFieldType {
-  (props: ControlledProps): React.ReactElement<any, any> | null;
-  <TKey extends keyof TState, TState>(props: ObjectProps<TKey, TState>): React.ReactElement<any, any> | null;
-}
-
-export const InputField: InputFieldType = observer<ControlledProps | ObjectProps<any, any>, HTMLInputElement>(
-  forwardRef(function InputField(
+export const InputFieldBase = observer<InputFieldBaseProps, HTMLInputElement>(
+  forwardRef(function InputFieldBase(
     {
       name,
-      value: valueControlled,
+      value,
       defaultValue,
       required,
-      state,
-      mapState,
-      mapValue,
       children,
       className,
       error,
       loading,
       description,
       labelTooltip,
-      autoHide,
       canShowPassword = true,
       onChange,
       onCustomCopy,
@@ -98,7 +69,6 @@ export const InputField: InputFieldType = observer<ControlledProps | ObjectProps
     const layoutProps = getLayoutProps(rest);
     rest = filterLayoutFakeProps(rest);
     const styles = useS(inputFieldStyle);
-    const context = useContext(FormContext);
     loading = useStateDelay(loading ?? false, 300);
 
     const revealPassword = useCallback(() => {
@@ -111,42 +81,25 @@ export const InputField: InputFieldType = observer<ControlledProps | ObjectProps
 
     const handleChange = useCallback(
       (event: React.ChangeEvent<HTMLInputElement>) => {
-        const value = mapValue?.(event.target.value) ?? event.target.value;
-
-        if (state) {
-          state[name] = value;
-        }
-        if (onChange) {
-          onChange(value, name);
-        }
-        if (context) {
-          context.change(value, name);
-        }
+        onChange?.(event.target.value, name);
       },
-      [state, name, context, onChange],
+      [name, onChange],
     );
 
     const handleBlur = useCombinedHandler(rest.onBlur, capsLock.handleBlur);
-    const handleKeyDown = useCombinedHandler(rest.onKeyDown, capsLock.handleKeyDown, context?.keyDown);
+    const handleKeyDown = useCombinedHandler(rest.onKeyDown, capsLock.handleKeyDown);
 
     const passwordType = rest.type === 'password';
     let uncontrolled = passwordType && !canShowPassword;
 
-    let value: any = valueControlled ?? undefined;
-
-    if (state && name !== undefined && name in state) {
-      value = state[name];
-    }
-
-    if (mapState) {
-      value = mapState(value);
-    }
-
     if (passwordType && !rest.readOnly && capsLock.warn) {
       description = translate('ui_capslock_on');
     }
 
     uncontrolled ||= value === undefined;
+    if (!value) {
+      canShowPassword = false;
+    }
 
     useLayoutEffect(() => {
       if (uncontrolled && isNotNullDefined(value) && inputRef.current) {
@@ -154,10 +107,6 @@ export const InputField: InputFieldType = observer<ControlledProps | ObjectProps
       }
     });
 
-    if (autoHide && !isControlPresented(name, state, defaultValue)) {
-      return null;
-    }
-
     return (
       <Field {...layoutProps} className={s(styles, {}, className)}>
         <FieldLabel title={labelTooltip || rest.title} className={s(styles, { fieldLabel: true })} required={required}>
@@ -169,7 +118,7 @@ export const InputField: InputFieldType = observer<ControlledProps | ObjectProps
             {...rest}
             type={passwordRevealed ? 'text' : rest.type}
             name={name}
-            value={uncontrolled ? undefined : value ?? ''}
+            value={uncontrolled ? undefined : value}
             defaultValue={defaultValue}
             className={s(styles, { input: true })}
             required={required}
@@ -198,4 +147,4 @@ export const InputField: InputFieldType = observer<ControlledProps | ObjectProps
       </Field>
     );
   }),
-) as InputFieldType;
+);
diff --git a/webapp/packages/core-blocks/src/FormControls/InputField/InputFieldState.tsx b/webapp/packages/core-blocks/src/FormControls/InputField/InputFieldState.tsx
new file mode 100644
index 0000000000..2fae8ebdeb
--- /dev/null
+++ b/webapp/packages/core-blocks/src/FormControls/InputField/InputFieldState.tsx
@@ -0,0 +1,40 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { observer } from 'mobx-react-lite';
+import React, { forwardRef } from 'react';
+
+import type { IFormStateControl } from '../IFormStateControl';
+import { useFormStateControl } from '../useFormStateControl';
+import { InputFieldBase, InputFieldBaseProps } from './InputFieldBase';
+
+export type InputFieldStateProps<TState extends Record<string, any>, TKey extends keyof TState> = Omit<InputFieldBaseProps, 'value'> &
+  IFormStateControl<TState, TKey>;
+
+interface InputFieldType {
+  <TState extends Record<string, any>, TKey extends keyof TState>(props: InputFieldStateProps<TState, TKey>): React.ReactElement<any, any> | null;
+}
+
+export const InputFieldState: InputFieldType = observer<InputFieldStateProps<any, any>, HTMLInputElement>(
+  forwardRef(function InputFieldState({ name, state, defaultState, mapState, mapValue, autoHide, onChange, ...rest }, ref) {
+    const controlState = useFormStateControl({ name, defaultState, state, autoHide, mapState, mapValue, onChange });
+
+    if (controlState.hide) {
+      return null;
+    }
+
+    return (
+      <InputFieldBase
+        ref={ref}
+        name={name}
+        value={controlState.stringValue ?? controlState.defaultValue ?? ''}
+        onChange={controlState.onChange}
+        {...rest}
+      />
+    );
+  }),
+) as InputFieldType;
diff --git a/webapp/packages/core-blocks/src/FormControls/InputFiles.tsx b/webapp/packages/core-blocks/src/FormControls/InputFiles.tsx
index 5cac53266b..d870c8258e 100644
--- a/webapp/packages/core-blocks/src/FormControls/InputFiles.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/InputFiles.tsx
@@ -8,8 +8,6 @@
 import { observer } from 'mobx-react-lite';
 import { forwardRef, useContext, useEffect, useState } from 'react';
 
-import type { ComponentStyle } from '@cloudbeaver/core-theming';
-
 import { Button } from '../Button';
 import { filterLayoutFakeProps, getLayoutProps } from '../Containers/filterLayoutFakeProps';
 import type { ILayoutSizeProps } from '../Containers/ILayoutSizeProps';
diff --git a/webapp/packages/core-blocks/src/FormControls/isControlPresented.ts b/webapp/packages/core-blocks/src/FormControls/isControlPresented.ts
index 33aaf3a1b5..e8b36c5b63 100644
--- a/webapp/packages/core-blocks/src/FormControls/isControlPresented.ts
+++ b/webapp/packages/core-blocks/src/FormControls/isControlPresented.ts
@@ -5,11 +5,12 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
+import { isNotNullDefined } from '@cloudbeaver/core-utils';
 
-export function isControlPresented(name: string | undefined, state: any, defaultValue?: string | number | readonly string[]): boolean {
-  if (state !== undefined && name !== undefined) {
+export function isControlPresented(name: string | undefined, state: any, defaultValue?: any): boolean {
+  if (isNotNullDefined(state) && isNotNullDefined(name)) {
     if (name in state) {
-      return state[name] !== null && state[name] !== undefined;
+      return isNotNullDefined(state[name]);
     }
     return defaultValue !== undefined;
   }
diff --git a/webapp/packages/core-blocks/src/FormControls/isFormStateControl.ts b/webapp/packages/core-blocks/src/FormControls/isFormStateControl.ts
new file mode 100644
index 0000000000..ebd1735a06
--- /dev/null
+++ b/webapp/packages/core-blocks/src/FormControls/isFormStateControl.ts
@@ -0,0 +1,14 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import type { IFormStateControl } from './IFormStateControl';
+
+export function isFormStateControl<TState extends Record<string, any>, TKey extends keyof TState>(
+  props: any,
+): props is IFormStateControl<TState, TKey> {
+  return 'name' in props && 'state' in props;
+}
diff --git a/webapp/packages/core-blocks/src/FormControls/useFormStateControl.ts b/webapp/packages/core-blocks/src/FormControls/useFormStateControl.ts
new file mode 100644
index 0000000000..25edf26c81
--- /dev/null
+++ b/webapp/packages/core-blocks/src/FormControls/useFormStateControl.ts
@@ -0,0 +1,58 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { isNotNullDefined, isObject } from '@cloudbeaver/core-utils';
+
+import { useCombinedHandler } from '../useCombinedHandler';
+import type { IFormStateControl } from './IFormStateControl';
+import { isControlPresented } from './isControlPresented';
+
+export function useFormStateControl<TState extends Record<string, any>, TKey extends keyof TState>({
+  name,
+  state: value,
+  defaultState: defaultValue,
+  mapState: mapToString,
+  mapValue: mapToValue,
+  onChange,
+  ...rest
+}: IFormStateControl<TState, TKey>) {
+  const originalValue = value;
+  const handleChange = useCombinedHandler(function handleChange(inputValue: string) {
+    if (mapToValue) {
+      inputValue = mapToValue(inputValue);
+    }
+
+    if (isNotNullDefined(originalValue) && isObject(originalValue)) {
+      (originalValue as any)[name] = inputValue;
+    }
+
+    if (onChange) {
+      onChange(inputValue as any, name as any);
+    }
+  });
+  if (isNotNullDefined(defaultValue) && isObject(defaultValue)) {
+    defaultValue = defaultValue[name];
+  }
+
+  if (isNotNullDefined(value) && isObject(value)) {
+    value = value[name];
+  }
+
+  let stringValue: string | typeof value;
+  let defaultStringValue: string | typeof defaultValue;
+  if (mapToString) {
+    stringValue = mapToString(value as any);
+    defaultStringValue = mapToString(defaultValue as any);
+  } else {
+    stringValue = value;
+    defaultStringValue = defaultValue;
+  }
+
+  const hide = 'autoHide' in rest && !!rest.autoHide && !isControlPresented(String(name), stringValue, defaultStringValue);
+
+  return { name, value, stringValue, defaultValue, defaultStringValue, hide, onChange: handleChange };
+}
diff --git a/webapp/packages/core-blocks/src/IconOrImage.tsx b/webapp/packages/core-blocks/src/IconOrImage.tsx
index 26749a9cc0..b19fa28687 100644
--- a/webapp/packages/core-blocks/src/IconOrImage.tsx
+++ b/webapp/packages/core-blocks/src/IconOrImage.tsx
@@ -18,14 +18,15 @@ export interface IconOrImageProps {
   title?: string;
   onClick?: () => void;
   viewBox?: string;
+  width?: number;
 }
 
-export const IconOrImage: React.FC<IconOrImageProps> = function IconOrImage({ icon, className, title, onClick, viewBox }) {
+export const IconOrImage: React.FC<IconOrImageProps> = function IconOrImage({ icon, className, title, onClick, viewBox, width }) {
   const isStaticIcon = useMemo(() => icon && (icon.startsWith('platform:') || icon.startsWith('/')), [icon]);
 
   if (isStaticIcon || isValidUrl(icon)) {
-    return <StaticImage title={title} icon={icon} className={className} onClick={onClick} />;
+    return <StaticImage title={title} icon={icon} width={width} className={className} onClick={onClick} />;
   }
 
-  return <Icon name={icon} className={className} viewBox={viewBox || '0 0 32 32'} onClick={onClick} />;
+  return <Icon name={icon} className={className} viewBox={viewBox || '0 0 32 32'} width={width} height={width} onClick={onClick} />;
 };
diff --git a/webapp/packages/core-blocks/src/ItemList/ItemList.m.css b/webapp/packages/core-blocks/src/ItemList/ItemList.m.css
index 7e4ded8b61..bcaa381f38 100644
--- a/webapp/packages/core-blocks/src/ItemList/ItemList.m.css
+++ b/webapp/packages/core-blocks/src/ItemList/ItemList.m.css
@@ -93,11 +93,14 @@
   font-weight: 500;
   min-width: 250px;
   padding: 8px 24px 8px 8px;
-  border-right: 1px solid;
 
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
+
+  &:not(:last-child) {
+    border-right: 1px solid;
+  }
 }
 .listItemDescription {
   composes: theme-typography--body2 from global;
diff --git a/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/ObjectPropertyInfoForm.tsx b/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/ObjectPropertyInfoForm.tsx
index c5e7389984..e6cca550c3 100644
--- a/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/ObjectPropertyInfoForm.tsx
+++ b/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/ObjectPropertyInfoForm.tsx
@@ -20,8 +20,9 @@ import { useS } from '../../useS';
 import { RenderField } from './RenderField';
 
 interface ObjectPropertyFormProps extends ILayoutSizeProps {
-  properties: ObjectPropertyInfo[];
+  properties: ReadonlyArray<ObjectPropertyInfo>;
   state?: Record<string, any>;
+  defaultState?: Record<string, any>;
   category?: string | null;
   editable?: boolean;
   autofillToken?: string;
@@ -41,6 +42,7 @@ interface ObjectPropertyFormProps extends ILayoutSizeProps {
 export const ObjectPropertyInfoForm = observer<ObjectPropertyFormProps>(function ObjectPropertyInfoForm({
   properties,
   state,
+  defaultState,
   category,
   editable = true,
   className,
@@ -86,6 +88,7 @@ export const ObjectPropertyInfoForm = observer<ObjectPropertyFormProps>(function
             className={s(sizeStyles, { ...(geLayoutSize ? geLayoutSize(property) : layoutProps) }, className)}
             property={property}
             state={state}
+            defaultState={defaultState}
             editable={editable}
             autofillToken={autofillToken}
             disabled={disabled}
diff --git a/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/RenderField.tsx b/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/RenderField.tsx
index 25d339cc77..9d74b04052 100644
--- a/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/RenderField.tsx
+++ b/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/RenderField.tsx
@@ -13,7 +13,7 @@ import { removeMetadataFromBase64 } from '@cloudbeaver/core-utils';
 import { FieldCheckbox } from '../../FormControls/Checkboxes/FieldCheckbox';
 import { Combobox } from '../../FormControls/Combobox';
 import { FormFieldDescription } from '../../FormControls/FormFieldDescription';
-import { InputField } from '../../FormControls/InputField';
+import { InputField } from '../../FormControls/InputField/InputField';
 import { InputFileTextContent } from '../../FormControls/InputFileTextContent';
 import { isControlPresented } from '../../FormControls/isControlPresented';
 import { Textarea } from '../../FormControls/Textarea';
@@ -26,6 +26,7 @@ const RESERVED_KEYWORDS = ['no', 'off', 'new-password'];
 interface RenderFieldProps {
   property: ObjectPropertyInfo;
   state?: Record<string, any>;
+  defaultState?: Record<string, any>;
   editable?: boolean;
   autofillToken?: string;
   disabled?: boolean;
@@ -55,6 +56,7 @@ function getValue(value: any, controlType: ControlType) {
 export const RenderField = observer<RenderFieldProps>(function RenderField({
   property,
   state,
+  defaultState,
   editable = true,
   autofillToken = '',
   disabled,
@@ -74,26 +76,6 @@ export const RenderField = observer<RenderFieldProps>(function RenderField({
 
   const value = getValue(property.value, controlType);
   const defaultValue = getValue(property.defaultValue, controlType);
-  const passwordSaved = showRememberTip && ((password && !!property.value) || saved);
-  const description = passwordSaved ? translate('ui_processing_saved') : undefined;
-
-  if (controlType === 'file' && state) {
-    return (
-      <InputFileTextContent
-        required={required}
-        tooltip={property.description}
-        labelTooltip={property.displayName || property.description}
-        name={property.id!}
-        state={state}
-        disabled={disabled}
-        fileName={description}
-        className={className}
-        mapValue={removeMetadataFromBase64}
-      >
-        {property.displayName}
-      </InputFileTextContent>
-    );
-  }
 
   if (controlType === 'link') {
     return (
@@ -128,6 +110,7 @@ export const RenderField = observer<RenderFieldProps>(function RenderField({
           title={property.description}
           disabled={disabled || readOnly}
           className={className}
+          groupGap
         >
           {property.displayName ?? ''}
         </FieldCheckbox>
@@ -142,6 +125,7 @@ export const RenderField = observer<RenderFieldProps>(function RenderField({
         title={property.description}
         disabled={disabled || readOnly}
         className={className}
+        groupGap
       >
         {property.displayName ?? ''}
       </FieldCheckbox>
@@ -189,6 +173,27 @@ export const RenderField = observer<RenderFieldProps>(function RenderField({
     );
   }
 
+  const passwordSaved = showRememberTip && ((password && !!property.value) || saved);
+  const passwordSavedMessage = passwordSaved ? translate('core_blocks_object_property_info_password_saved') : undefined;
+
+  if (controlType === 'file' && state) {
+    return (
+      <InputFileTextContent
+        required={required}
+        tooltip={property.description}
+        labelTooltip={property.displayName || property.description}
+        name={property.id!}
+        state={state}
+        disabled={disabled}
+        fileName={passwordSavedMessage}
+        className={className}
+        mapValue={removeMetadataFromBase64}
+      >
+        {property.displayName}
+      </InputFileTextContent>
+    );
+  }
+
   if (controlType === 'textarea') {
     if (state !== undefined) {
       return (
@@ -196,7 +201,7 @@ export const RenderField = observer<RenderFieldProps>(function RenderField({
           required={required}
           title={state[property.id!]}
           labelTooltip={property.description || property.displayName}
-          description={description}
+          placeholder={passwordSavedMessage}
           name={property.id!}
           state={state}
           disabled={disabled}
@@ -213,7 +218,7 @@ export const RenderField = observer<RenderFieldProps>(function RenderField({
         required={required}
         title={value}
         labelTooltip={property.description || property.displayName}
-        description={description}
+        placeholder={passwordSavedMessage}
         name={property.id!}
         value={value}
         disabled={disabled}
@@ -230,15 +235,17 @@ export const RenderField = observer<RenderFieldProps>(function RenderField({
       <InputField
         required={required}
         type={password ? 'password' : 'text'}
-        title={password ? property.description || property.displayName : state[property.id!]}
+        title={password ? property.description || property.displayName : undefined}
         labelTooltip={property.description || property.displayName}
         name={property.id!}
         state={state}
+        defaultState={defaultState}
+        autoHide={autoHide}
         defaultValue={defaultValue}
-        description={description ?? property.hint}
+        description={property.hint}
+        placeholder={passwordSavedMessage}
         disabled={disabled}
         readOnly={readOnly}
-        autoHide={autoHide}
         autoComplete={RESERVED_KEYWORDS.includes(autofillToken) ? autofillToken : `${autofillToken} ${property.id}`}
         className={className}
         canShowPassword={canShowPassword}
@@ -253,12 +260,13 @@ export const RenderField = observer<RenderFieldProps>(function RenderField({
     <InputField
       required={required}
       type={password ? 'password' : 'text'}
-      title={password ? property.description || property.displayName : value}
+      title={password ? property.description || property.displayName : undefined}
       labelTooltip={property.description || property.displayName}
       name={property.id!}
       value={value}
       defaultValue={defaultValue}
-      description={description ?? property.hint}
+      description={property.hint}
+      placeholder={passwordSavedMessage}
       disabled={disabled}
       readOnly={readOnly}
       autoComplete={RESERVED_KEYWORDS.includes(autofillToken) ? autofillToken : `${autofillToken} ${property.id}`}
diff --git a/webapp/packages/core-blocks/src/PropertiesTable/PropertiesTable.tsx b/webapp/packages/core-blocks/src/PropertiesTable/PropertiesTable.tsx
index 381cc00320..8a04e9831f 100644
--- a/webapp/packages/core-blocks/src/PropertiesTable/PropertiesTable.tsx
+++ b/webapp/packages/core-blocks/src/PropertiesTable/PropertiesTable.tsx
@@ -13,18 +13,18 @@ import { Button } from '../Button';
 import ButtonStyles from '../Button.m.css';
 import { Filter } from '../FormControls/Filter';
 import FilterStyles from '../FormControls/Filter.m.css';
-import InputFieldStyles from '../FormControls/InputField.m.css';
+import InputFieldStyles from '../FormControls/InputField/InputField.m.css';
 import { useTranslate } from '../localization/useTranslate';
+import { s } from '../s';
 import { SContext, StyleRegistry } from '../SContext';
 import { useObjectRef } from '../useObjectRef';
+import { useS } from '../useS';
 import type { IProperty } from './IProperty';
+import styles from './PropertiesTable.m.css';
 import PropertiesTableAddButtonStyles from './PropertiesTableAddButtonStyles.m.css';
 import PropertiesTableFilterStyles from './PropertiesTableFilterStyles.m.css';
 import PropertiesTableInputStyles from './PropertiesTableInputStyles.m.css';
 import { PropertyItem } from './PropertyItem';
-import { useS } from '../useS';
-import styles from './PropertiesTable.m.css';
-import { s } from '../s';
 
 type PropertiesState = Record<string, string | null>;
 
diff --git a/webapp/packages/core-blocks/src/ResourcesHooks/useResource.ts b/webapp/packages/core-blocks/src/ResourcesHooks/useResource.ts
index 3f98b5b492..ff219920c8 100644
--- a/webapp/packages/core-blocks/src/ResourcesHooks/useResource.ts
+++ b/webapp/packages/core-blocks/src/ResourcesHooks/useResource.ts
@@ -48,7 +48,7 @@ interface IActions<TResource extends IResource<any, any, any, any>, TKey, TInclu
   active?: boolean;
   forceSuspense?: boolean;
   silent?: boolean;
-  onData?: (data: ResourceData<TResource, TKey, TIncludes>, resource: TResource) => Promise<any> | any;
+  onData?: (data: ResourceData<TResource, TKey, TIncludes>, resource: TResource) => any;
   onError?: (exception: Error | Error[] | null) => void;
 }
 
diff --git a/webapp/packages/core-blocks/src/index.ts b/webapp/packages/core-blocks/src/index.ts
index 39cb6cd39d..01deef7ff3 100644
--- a/webapp/packages/core-blocks/src/index.ts
+++ b/webapp/packages/core-blocks/src/index.ts
@@ -155,8 +155,8 @@ export * from './Tags/Tags';
 export * from './FormControls/Combobox';
 export * from './FormControls/FormContext';
 export * from './FormControls/FormFieldDescription';
-export * from './FormControls/InputField';
-export { default as InputFieldStyles } from './FormControls/InputField.m.css';
+export * from './FormControls/InputField/InputField';
+export { default as InputFieldStyles } from './FormControls/InputField/InputField.m.css';
 export * from './FormControls/InputFiles';
 export * from './FormControls/InputFileTextContent';
 export * from './FormControls/Radio';
diff --git a/webapp/packages/core-blocks/src/locales/en.ts b/webapp/packages/core-blocks/src/locales/en.ts
index d987a57b40..9284a03de0 100644
--- a/webapp/packages/core-blocks/src/locales/en.ts
+++ b/webapp/packages/core-blocks/src/locales/en.ts
@@ -5,6 +5,7 @@ export default [
   ['core_block_properties_table_add', 'Add property'],
   ['core_blocks_properties_table_item_reset', 'Reset to default'],
   ['core_blocks_object_property_info_form_empty_placeholder', 'Properties empty'],
+  ['core_blocks_object_property_info_password_saved', 'Field value is saved'],
   ['core_blocks_properties_table_item_remove', 'Remove property'],
   ['combobox_no_results_placeholder', 'No results'],
   ['core_blocks_exception_message_error_title', 'Unable to display content'],
diff --git a/webapp/packages/core-connections/src/CONNECTION_INFO_PARAM_SCHEMA.ts b/webapp/packages/core-connections/src/CONNECTION_INFO_PARAM_SCHEMA.ts
new file mode 100644
index 0000000000..96ec0e63de
--- /dev/null
+++ b/webapp/packages/core-connections/src/CONNECTION_INFO_PARAM_SCHEMA.ts
@@ -0,0 +1,18 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { schema } from '@cloudbeaver/core-utils';
+
+export const CONNECTION_INFO_PARAM_SCHEMA = schema
+  .object({
+    projectId: schema.string(),
+    connectionId: schema.string(),
+  })
+  .required()
+  .strict();
+
+export type IConnectionInfoParams = schema.infer<typeof CONNECTION_INFO_PARAM_SCHEMA>;
diff --git a/webapp/packages/core-connections/src/ConnectionDialectResource.ts b/webapp/packages/core-connections/src/ConnectionDialectResource.ts
index 51a9a00f14..9723ddd7c6 100644
--- a/webapp/packages/core-connections/src/ConnectionDialectResource.ts
+++ b/webapp/packages/core-connections/src/ConnectionDialectResource.ts
@@ -11,6 +11,7 @@ import { ProjectsService } from '@cloudbeaver/core-projects';
 import { CachedMapAllKey, CachedMapResource, type ResourceKey, resourceKeyList, ResourceKeyUtils } from '@cloudbeaver/core-resource';
 import { GraphQLService, SqlDialectInfo } from '@cloudbeaver/core-sdk';
 
+import type { IConnectionInfoParams } from './CONNECTION_INFO_PARAM_SCHEMA';
 import type { IConnectionExecutionContextInfo } from './ConnectionExecutionContext/ConnectionExecutionContextResource';
 import {
   ConnectionInfoActiveProjectKey,
@@ -18,7 +19,6 @@ import {
   ConnectionInfoResource,
   isConnectionInfoParamEqual,
 } from './ConnectionInfoResource';
-import type { IConnectionInfoParams } from './IConnectionsResource';
 
 export type ConnectionDialect = SqlDialectInfo;
 
diff --git a/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContextResource.ts b/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContextResource.ts
index 3ddeb20248..a840a75282 100644
--- a/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContextResource.ts
+++ b/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContextResource.ts
@@ -22,8 +22,8 @@ import {
 import { GraphQLService, SqlContextInfo } from '@cloudbeaver/core-sdk';
 import { flat } from '@cloudbeaver/core-utils';
 
+import type { IConnectionInfoParams } from '../CONNECTION_INFO_PARAM_SCHEMA';
 import { ConnectionInfoActiveProjectKey, ConnectionInfoResource } from '../ConnectionInfoResource';
-import type { IConnectionInfoParams } from '../IConnectionsResource';
 
 export const ConnectionExecutionContextProjectKey = resourceKeyAliasFactory('@connection-folder/project', (projectId: string) => ({ projectId }));
 
diff --git a/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContextService.ts b/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContextService.ts
index df1501524c..8747a60e2b 100644
--- a/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContextService.ts
+++ b/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContextService.ts
@@ -10,7 +10,7 @@ import { TaskScheduler } from '@cloudbeaver/core-executor';
 import { CachedMapAllKey, ResourceKeyUtils } from '@cloudbeaver/core-resource';
 import { MetadataMap } from '@cloudbeaver/core-utils';
 
-import type { IConnectionInfoParams } from '../IConnectionsResource';
+import type { IConnectionInfoParams } from '../CONNECTION_INFO_PARAM_SCHEMA';
 import { ConnectionExecutionContext } from './ConnectionExecutionContext';
 import { ConnectionExecutionContextResource } from './ConnectionExecutionContextResource';
 
diff --git a/webapp/packages/core-connections/src/ConnectionInfoResource.ts b/webapp/packages/core-connections/src/ConnectionInfoResource.ts
index 4323aad75b..b1b5bfc35a 100644
--- a/webapp/packages/core-connections/src/ConnectionInfoResource.ts
+++ b/webapp/packages/core-connections/src/ConnectionInfoResource.ts
@@ -5,7 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-import { action, makeObservable, observable, runInAction } from 'mobx';
+import { action, makeObservable, observable, runInAction, toJS } from 'mobx';
 
 import { AppAuthService, UserInfoResource } from '@cloudbeaver/core-authentication';
 import { injectable } from '@cloudbeaver/core-di';
@@ -35,10 +35,11 @@ import {
   TestConnectionMutation,
   UserConnectionAuthPropertiesFragment,
 } from '@cloudbeaver/core-sdk';
+import { schemaValidationError } from '@cloudbeaver/core-utils';
 
+import { CONNECTION_INFO_PARAM_SCHEMA, type IConnectionInfoParams } from './CONNECTION_INFO_PARAM_SCHEMA';
 import { ConnectionInfoEventHandler, IConnectionInfoEvent } from './ConnectionInfoEventHandler';
 import type { DatabaseConnection } from './DatabaseConnection';
-import type { IConnectionInfoParams } from './IConnectionsResource';
 
 export type Connection = DatabaseConnection & {
   authProperties?: UserConnectionAuthPropertiesFragment[];
@@ -53,6 +54,7 @@ export type ConnectionInitConfig = Omit<
   | 'includeCredentialsSaved'
   | 'includeProperties'
   | 'includeProviderProperties'
+  | 'includeSharedSecrets'
   | 'customIncludeOptions'
 >;
 export type ConnectionInfoIncludes = Omit<GetUserConnectionsQueryVariables, 'id'>;
@@ -577,12 +579,17 @@ export class ConnectionInfoResource extends CachedMapResource<IConnectionInfoPar
       includeCredentialsSaved: false,
       includeProperties: false,
       includeProviderProperties: false,
+      includeSharedSecrets: false,
       customIncludeOptions: false,
     };
   }
 
   protected validateKey(key: IConnectionInfoParams): boolean {
-    return typeof key === 'object' && typeof key.projectId === 'string' && typeof key.connectionId === 'string';
+    const parse = CONNECTION_INFO_PARAM_SCHEMA.safeParse(toJS(key));
+    if (!parse.success) {
+      this.logger.warn(`Invalid resource key ${schemaValidationError(parse.error).toString()}`);
+    }
+    return parse.success;
   }
 }
 
diff --git a/webapp/packages/core-connections/src/ConnectionsManagerService.ts b/webapp/packages/core-connections/src/ConnectionsManagerService.ts
index 53d0c81286..82f695bd68 100644
--- a/webapp/packages/core-connections/src/ConnectionsManagerService.ts
+++ b/webapp/packages/core-connections/src/ConnectionsManagerService.ts
@@ -15,9 +15,14 @@ import { Executor, ExecutorInterrupter, IExecutor } from '@cloudbeaver/core-exec
 import { ProjectInfo, projectInfoSortByName, ProjectsService } from '@cloudbeaver/core-projects';
 import { isArraysEqual } from '@cloudbeaver/core-utils';
 
+import type { IConnectionInfoParams } from './CONNECTION_INFO_PARAM_SCHEMA';
 import { Connection, ConnectionInfoResource, createConnectionParam, isConnectionInfoParamEqual } from './ConnectionInfoResource';
 import { ContainerResource, IStructContainers, ObjectContainer } from './ContainerResource';
-import type { IConnectionInfoParams } from './IConnectionsResource';
+
+export interface IRequireConnectionExecutorData {
+  key: IConnectionInfoParams;
+  resetCredentials?: boolean;
+}
 
 export interface IConnectionExecutorData {
   connections: IConnectionInfoParams[];
@@ -32,7 +37,7 @@ export class ConnectionsManagerService {
   get createConnectionProjects(): ProjectInfo[] {
     return this.projectsService.activeProjects.filter(project => project.canEditDataSources).sort(projectInfoSortByName);
   }
-  readonly connectionExecutor: IExecutor<IConnectionInfoParams>;
+  readonly connectionExecutor: IExecutor<IRequireConnectionExecutorData>;
   readonly onDisconnect: IExecutor<IConnectionExecutorData>;
   readonly onDelete: IExecutor<IConnectionExecutorData>;
 
@@ -47,11 +52,11 @@ export class ConnectionsManagerService {
   ) {
     this.disconnecting = false;
 
-    this.connectionExecutor = new Executor<IConnectionInfoParams>(null, isConnectionInfoParamEqual);
+    this.connectionExecutor = new Executor<IRequireConnectionExecutorData>(null, (a, b) => isConnectionInfoParamEqual(a.key, b.key));
     this.onDisconnect = new Executor();
     this.onDelete = new Executor();
 
-    this.connectionExecutor.addHandler(key => connectionInfo.load(key));
+    this.connectionExecutor.addHandler(data => connectionInfo.load(data.key));
     this.onDelete.before(this.onDisconnect);
 
     makeObservable(this, {
@@ -64,8 +69,8 @@ export class ConnectionsManagerService {
     });
   }
 
-  async requireConnection(key: IConnectionInfoParams): Promise<Connection | null> {
-    const context = await this.connectionExecutor.execute(key);
+  async requireConnection(key: IConnectionInfoParams, resetCredentials?: boolean): Promise<Connection | null> {
+    const context = await this.connectionExecutor.execute({ key, resetCredentials });
     const connection = context.getContext(this.connectionContext);
 
     return connection.connection;
diff --git a/webapp/packages/core-connections/src/ContainerResource.ts b/webapp/packages/core-connections/src/ContainerResource.ts
index 1a4d7e7e5a..3363007e28 100644
--- a/webapp/packages/core-connections/src/ContainerResource.ts
+++ b/webapp/packages/core-connections/src/ContainerResource.ts
@@ -12,8 +12,8 @@ import { CachedMapResource, isResourceAlias, type ResourceKey, resourceKeyList,
 import { GraphQLService, NavNodeInfoFragment } from '@cloudbeaver/core-sdk';
 import { isNull } from '@cloudbeaver/core-utils';
 
-import { ConnectionInfoActiveProjectKey, ConnectionInfoResource } from './ConnectionInfoResource';
-import type { IConnectionInfoParams } from './IConnectionsResource';
+import type { IConnectionInfoParams } from './CONNECTION_INFO_PARAM_SCHEMA';
+import { ConnectionInfoActiveProjectKey, ConnectionInfoResource, createConnectionParam } from './ConnectionInfoResource';
 
 export type ObjectContainer = NavNodeInfoFragment;
 export interface ICatalogData {
@@ -47,7 +47,14 @@ export class ContainerResource extends CachedMapResource<ObjectContainerParams,
 
     appAuthService.requireAuthentication(this);
     this.preloadResource(connectionInfoResource, () => ConnectionInfoActiveProjectKey);
-    this.before(ExecutorInterrupter.interrupter(key => !connectionInfoResource.isConnected(key)));
+    this.before(
+      ExecutorInterrupter.interrupter(key => {
+        if (isResourceAlias(key)) {
+          return false;
+        }
+        return !connectionInfoResource.isConnected(ResourceKeyUtils.mapKey(key, key => createConnectionParam(key.projectId, key.connectionId)));
+      }),
+    );
 
     this.connectionInfoResource.onItemDelete.addHandler(key =>
       ResourceKeyUtils.forEach(key, key => this.delete({ projectId: key.projectId, connectionId: key.connectionId })),
diff --git a/webapp/packages/core-connections/src/DBDriverResource.ts b/webapp/packages/core-connections/src/DBDriverResource.ts
index f00bf05b6a..bd710cc82d 100644
--- a/webapp/packages/core-connections/src/DBDriverResource.ts
+++ b/webapp/packages/core-connections/src/DBDriverResource.ts
@@ -11,7 +11,7 @@ import { AppAuthService } from '@cloudbeaver/core-authentication';
 import { injectable } from '@cloudbeaver/core-di';
 import { CachedMapAllKey, CachedMapResource, isResourceAlias, type ResourceKey, resourceKeyList, ResourceKeyUtils } from '@cloudbeaver/core-resource';
 import { ServerConfigResource } from '@cloudbeaver/core-root';
-import { DatabaseDriverFragment, DriverListQueryVariables, GraphQLService } from '@cloudbeaver/core-sdk';
+import { DatabaseDriverFragment, DriverConfigurationType, DriverListQueryVariables, GraphQLService } from '@cloudbeaver/core-sdk';
 import { isArraysEqual } from '@cloudbeaver/core-utils';
 
 export type DBDriver = DatabaseDriverFragment;
@@ -19,10 +19,10 @@ export type DBDriver = DatabaseDriverFragment;
 export const NEW_DRIVER_SYMBOL = Symbol('new-driver');
 
 export type NewDBDriver = DBDriver & { [NEW_DRIVER_SYMBOL]: boolean; timestamp: number };
-type DriverResourceIncludes = Omit<DriverListQueryVariables, 'driverId'>;
+export type DBDriverResourceIncludes = Omit<DriverListQueryVariables, 'driverId'>;
 
 @injectable()
-export class DBDriverResource extends CachedMapResource<string, DBDriver, DriverListQueryVariables> {
+export class DBDriverResource extends CachedMapResource<string, DBDriver, DBDriverResourceIncludes> {
   get enabledDrivers() {
     return this.values.filter(driver => driver.enabled).sort(this.compare);
   }
@@ -107,7 +107,7 @@ export class DBDriverResource extends CachedMapResource<string, DBDriver, Driver
     }
   }
 
-  getDefaultIncludes(): DriverResourceIncludes {
+  getDefaultIncludes(): DBDriverResourceIncludes {
     return {
       includeDriverLibraries: false,
       includeDriverParameters: false,
@@ -140,3 +140,19 @@ export function compareNewDrivers(a: DBDriver, b: DBDriver): number {
 
   return 0;
 }
+
+export function getDBDriverDefaultAuthModelId(driver: DBDriver | undefined): string | undefined {
+  return driver?.defaultAuthModel || driver?.applicableAuthModels[0];
+}
+
+export function getDBDriverDefaultConfigurationType(driver: DBDriver | undefined): DriverConfigurationType {
+  return driver?.configurationTypes[0] || DriverConfigurationType.Manual;
+}
+
+export function getDBDriverDefaultServerName(driver: DBDriver | undefined): string | undefined {
+  return driver?.requiresServerName ? '' : undefined;
+}
+
+export function getDBDriverDefaultServer(driver: DBDriver | undefined): string | undefined {
+  return driver?.defaultServer || 'localhost';
+}
diff --git a/webapp/packages/core-connections/src/DatabaseAuthModelsResource.ts b/webapp/packages/core-connections/src/DatabaseAuthModelsResource.ts
index 372a62170e..d4b79e490d 100644
--- a/webapp/packages/core-connections/src/DatabaseAuthModelsResource.ts
+++ b/webapp/packages/core-connections/src/DatabaseAuthModelsResource.ts
@@ -8,7 +8,9 @@
 import { injectable } from '@cloudbeaver/core-di';
 import { CachedMapAllKey, CachedMapResource, resourceKeyList } from '@cloudbeaver/core-resource';
 import { ServerConfigResource } from '@cloudbeaver/core-root';
-import { type DatabaseAuthModel, GraphQLService } from '@cloudbeaver/core-sdk';
+import { type DatabaseAuthModel as DatabaseAuthModelBase, GraphQLService } from '@cloudbeaver/core-sdk';
+
+export type DatabaseAuthModel = DatabaseAuthModelBase;
 
 @injectable()
 export class DatabaseAuthModelsResource extends CachedMapResource<string, DatabaseAuthModel> {
diff --git a/webapp/packages/core-connections/src/NavTree/ConnectionNavNodeService.ts b/webapp/packages/core-connections/src/NavTree/ConnectionNavNodeService.ts
index 37d6ecfe64..9786cc9570 100644
--- a/webapp/packages/core-connections/src/NavTree/ConnectionNavNodeService.ts
+++ b/webapp/packages/core-connections/src/NavTree/ConnectionNavNodeService.ts
@@ -20,11 +20,11 @@ import { getProjectNodeId } from '@cloudbeaver/core-projects';
 import { isResourceAlias, type ResourceKey, resourceKeyList, ResourceKeySimple, ResourceKeyUtils } from '@cloudbeaver/core-resource';
 import { ServerEventId } from '@cloudbeaver/core-root';
 
+import type { IConnectionInfoParams } from '../CONNECTION_INFO_PARAM_SCHEMA';
 import { ConnectionFolderEventHandler, IConnectionFolderEvent } from '../ConnectionFolderEventHandler';
 import { Connection, ConnectionInfoActiveProjectKey, ConnectionInfoResource, createConnectionParam } from '../ConnectionInfoResource';
 import { ConnectionsManagerService } from '../ConnectionsManagerService';
 import { ContainerResource } from '../ContainerResource';
-import type { IConnectionInfoParams } from '../IConnectionsResource';
 import { getConnectionParentId } from './getConnectionParentId';
 import { getFolderNodeParents } from './getFolderNodeParents';
 
diff --git a/webapp/packages/core-connections/src/NavTree/NavNodeExtensionsService.ts b/webapp/packages/core-connections/src/NavTree/NavNodeExtensionsService.ts
index 24064517d5..500d566d5e 100644
--- a/webapp/packages/core-connections/src/NavTree/NavNodeExtensionsService.ts
+++ b/webapp/packages/core-connections/src/NavTree/NavNodeExtensionsService.ts
@@ -10,11 +10,11 @@ import type { IExtension } from '@cloudbeaver/core-extensions';
 import { NavNodeInfoResource, NavNodeManagerService } from '@cloudbeaver/core-navigation-tree';
 import { projectProvider } from '@cloudbeaver/core-projects';
 
+import type { IConnectionInfoParams } from '../CONNECTION_INFO_PARAM_SCHEMA';
 import { ConnectionInfoResource, createConnectionParam } from '../ConnectionInfoResource';
 import { connectionProvider } from '../extensions/IConnectionProvider';
 import { objectCatalogProvider } from '../extensions/IObjectCatalogProvider';
 import { objectSchemaProvider } from '../extensions/IObjectSchemaProvider';
-import type { IConnectionInfoParams } from '../IConnectionsResource';
 
 @injectable()
 export class NavNodeExtensionsService {
diff --git a/webapp/packages/core-connections/src/extensions/IConnectionProvider.ts b/webapp/packages/core-connections/src/extensions/IConnectionProvider.ts
index 415d1d287f..b59eca3800 100644
--- a/webapp/packages/core-connections/src/extensions/IConnectionProvider.ts
+++ b/webapp/packages/core-connections/src/extensions/IConnectionProvider.ts
@@ -7,7 +7,7 @@
  */
 import { createExtension, IExtension, isExtension } from '@cloudbeaver/core-extensions';
 
-import type { IConnectionInfoParams } from '../IConnectionsResource';
+import type { IConnectionInfoParams } from '../CONNECTION_INFO_PARAM_SCHEMA';
 
 const connectionProviderSymbol = Symbol('@extension/ConnectionProvider');
 
diff --git a/webapp/packages/core-connections/src/extensions/IConnectionSetter.ts b/webapp/packages/core-connections/src/extensions/IConnectionSetter.ts
index e092db5e94..74e8cebc18 100644
--- a/webapp/packages/core-connections/src/extensions/IConnectionSetter.ts
+++ b/webapp/packages/core-connections/src/extensions/IConnectionSetter.ts
@@ -7,7 +7,7 @@
  */
 import { createExtension, IExtension, isExtension } from '@cloudbeaver/core-extensions';
 
-import type { IConnectionInfoParams } from '../IConnectionsResource';
+import type { IConnectionInfoParams } from '../CONNECTION_INFO_PARAM_SCHEMA';
 
 const connectionSetterSymbol = Symbol('@extension/ConnectionSetter');
 
diff --git a/webapp/packages/core-connections/src/index.ts b/webapp/packages/core-connections/src/index.ts
index 1b5d7316e4..ede58b7a42 100644
--- a/webapp/packages/core-connections/src/index.ts
+++ b/webapp/packages/core-connections/src/index.ts
@@ -33,7 +33,7 @@ export * from './createConnectionFolderParam';
 export * from './DatabaseAuthModelsResource';
 export * from './DatabaseConnection';
 export * from './DBDriverResource';
-export * from './IConnectionsResource';
+export * from './CONNECTION_INFO_PARAM_SCHEMA';
 export * from './isJDBCConnection';
 export * from './NetworkHandlerResource';
 export * from './useConnectionInfo';
diff --git a/webapp/packages/core-connections/src/useConnectionInfo.ts b/webapp/packages/core-connections/src/useConnectionInfo.ts
index eea58fcd69..6bef7a288a 100644
--- a/webapp/packages/core-connections/src/useConnectionInfo.ts
+++ b/webapp/packages/core-connections/src/useConnectionInfo.ts
@@ -10,9 +10,9 @@ import { computed, observable } from 'mobx';
 import { useObservableRef } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 
+import type { IConnectionInfoParams } from './CONNECTION_INFO_PARAM_SCHEMA';
 import { Connection, ConnectionInfoResource } from './ConnectionInfoResource';
 import { ConnectionsManagerService } from './ConnectionsManagerService';
-import type { IConnectionInfoParams } from './IConnectionsResource';
 
 interface IPrivate extends IPublic {
   manager: ConnectionsManagerService;
diff --git a/webapp/packages/core-localization/src/locales/en.ts b/webapp/packages/core-localization/src/locales/en.ts
index 579789ec34..7460c1e17c 100644
--- a/webapp/packages/core-localization/src/locales/en.ts
+++ b/webapp/packages/core-localization/src/locales/en.ts
@@ -78,6 +78,7 @@ export default [
   ['ui_reconnect', 'Reconnect'],
   ['ui_forget', 'Forget'],
   ['ui_set', 'Set'],
+  ['ui_restore', 'Restore'],
   ['ui_are_you_sure', 'Are you sure?'],
   ['ui_options', 'Options'],
   ['ui_changes_might_be_lost', 'Your changes might be lost'],
diff --git a/webapp/packages/core-localization/src/locales/it.ts b/webapp/packages/core-localization/src/locales/it.ts
index a25238f52a..973a53da48 100644
--- a/webapp/packages/core-localization/src/locales/it.ts
+++ b/webapp/packages/core-localization/src/locales/it.ts
@@ -69,6 +69,13 @@ export default [
   ['ui_no_items_placeholder', 'Non ci sono ancora elementi.'],
   ['ui_search_no_result_placeholder', 'Nessun risultato trovato.'],
   ['ui_save_reminder', 'Ci sono modifiche non salvate.'],
+  ['ui_yes', 'Yes'],
+  ['ui_no', 'No'],
+  ['ui_select_all', 'Select all'],
+  ['ui_reconnect', 'Reconnect'],
+  ['ui_forget', 'Forget'],
+  ['ui_set', 'Set'],
+  ['ui_restore', 'Restore'],
   ['ui_settings', 'Impostazioni'],
   ['ui_advanced_settings', 'Advanced settings'],
   ['ui_expand', 'Expand'],
diff --git a/webapp/packages/core-localization/src/locales/ru.ts b/webapp/packages/core-localization/src/locales/ru.ts
index d72791ff8e..dbe87c9686 100644
--- a/webapp/packages/core-localization/src/locales/ru.ts
+++ b/webapp/packages/core-localization/src/locales/ru.ts
@@ -74,6 +74,7 @@ export default [
   ['ui_reconnect', 'Переподключиться'],
   ['ui_forget', 'Забыть'],
   ['ui_set', 'Установить'],
+  ['ui_restore', 'Восстановить'],
   ['ui_are_you_sure', 'Вы уверены?'],
   ['ui_options', 'Параметры'],
   ['ui_changes_might_be_lost', 'Ваши изменения могут быть потеряны'],
diff --git a/webapp/packages/core-localization/src/locales/zh.ts b/webapp/packages/core-localization/src/locales/zh.ts
index 86042dae8d..ecf73a1a19 100644
--- a/webapp/packages/core-localization/src/locales/zh.ts
+++ b/webapp/packages/core-localization/src/locales/zh.ts
@@ -75,6 +75,7 @@ export default [
   ['ui_reconnect', '重新连接'],
   ['ui_forget', '忘记'],
   ['ui_set', '设置'],
+  ['ui_restore', 'Restore'],
   ['ui_are_you_sure', '您确定吗?'],
   ['ui_options', '选项'],
   ['ui_changes_might_be_lost', '您的更改可能会丢失'],
diff --git a/webapp/packages/core-resource/src/Resource/CachedDataResource.ts b/webapp/packages/core-resource/src/Resource/CachedDataResource.ts
index 0bdc09b7ef..c0b7ccc4e7 100644
--- a/webapp/packages/core-resource/src/Resource/CachedDataResource.ts
+++ b/webapp/packages/core-resource/src/Resource/CachedDataResource.ts
@@ -58,32 +58,32 @@ export abstract class CachedDataResource<
 
 export function getCachedDataResourceLoaderState<TData, TKey = void, TContext extends Record<string, any> = Record<string, never>>(
   resource: CachedDataResource<TData, TKey, TContext>,
-  param: TKey,
-  context?: CachedResourceIncludeArgs<TData, TContext>,
+  getKey: () => TKey,
+  getIncludes?: () => CachedResourceIncludeArgs<TData, TContext> | undefined,
   lazy?: boolean,
 ): ILoadableState {
   return {
     lazy,
     get exception() {
-      return resource.getException(param);
+      return resource.getException(getKey());
     },
     isLoading() {
-      return resource.isLoading(param);
+      return resource.isLoading(getKey());
     },
     isError() {
       return isContainsException(this.exception);
     },
     isLoaded() {
-      return resource.isLoaded(param, context);
+      return resource.isLoaded(getKey(), getIncludes?.());
     },
     isOutdated() {
-      return resource.isOutdated(param, context);
+      return resource.isOutdated(getKey(), getIncludes?.());
     },
     async load() {
-      await resource.load(param, context);
+      await resource.load(getKey(), getIncludes?.());
     },
     async reload() {
-      await resource.refresh(param, context);
+      await resource.refresh(getKey(), getIncludes?.());
     },
   };
 }
diff --git a/webapp/packages/core-resource/src/Resource/CachedMapResource.ts b/webapp/packages/core-resource/src/Resource/CachedMapResource.ts
index 679a664d90..f9096f4aa5 100644
--- a/webapp/packages/core-resource/src/Resource/CachedMapResource.ts
+++ b/webapp/packages/core-resource/src/Resource/CachedMapResource.ts
@@ -265,32 +265,68 @@ export abstract class CachedMapResource<
 
 export function getCachedMapResourceLoaderState<TKey, TValue, TContext extends Record<string, any> = Record<string, never>>(
   resource: CachedMapResource<TKey, TValue, TContext>,
-  getKey: () => ResourceKey<TKey>,
+  getKey: () => ResourceKey<TKey> | null,
   getIncludes?: () => CachedResourceIncludeArgs<TValue, TContext> | undefined,
   lazy?: boolean,
 ): ILoadableState {
   return {
     lazy,
     get exception() {
-      return resource.getException(getKey());
+      const key = getKey();
+
+      if (key === null) {
+        return null;
+      }
+
+      return resource.getException(key);
     },
     isLoading() {
-      return resource.isLoading(getKey());
+      const key = getKey();
+
+      if (key === null) {
+        return false;
+      }
+
+      return resource.isLoading(key);
     },
     isLoaded() {
-      return resource.isLoaded(getKey(), getIncludes?.());
+      const key = getKey();
+
+      if (key === null) {
+        return true;
+      }
+
+      return resource.isLoaded(key, getIncludes?.());
     },
     isError() {
       return isContainsException(this.exception);
     },
     isOutdated() {
-      return resource.isOutdated(getKey(), getIncludes?.());
+      const key = getKey();
+
+      if (key === null) {
+        return false;
+      }
+
+      return resource.isOutdated(key, getIncludes?.());
     },
     async load() {
-      await resource.load(getKey(), getIncludes?.());
+      const key = getKey();
+
+      if (key === null) {
+        return;
+      }
+
+      await resource.load(key, getIncludes?.());
     },
     async reload() {
-      await resource.refresh(getKey(), getIncludes?.());
+      const key = getKey();
+
+      if (key === null) {
+        return;
+      }
+
+      await resource.refresh(key, getIncludes?.());
     },
   };
 }
diff --git a/webapp/packages/core-resource/src/Resource/CachedResource.ts b/webapp/packages/core-resource/src/Resource/CachedResource.ts
index 0635010419..25e2e720b0 100644
--- a/webapp/packages/core-resource/src/Resource/CachedResource.ts
+++ b/webapp/packages/core-resource/src/Resource/CachedResource.ts
@@ -655,10 +655,14 @@ export abstract class CachedResource<
             this.dataUpdate(key);
           }
         },
-        error: exception => {
-          this.markOutdatedSync(key);
-          this.markError(exception, key, include);
-        },
+        // TODO: must rethink how to handle exceptions form performUpdate
+        //       probably we need to handle this exceptions at the place
+        //       where performUpdate is called
+        //       because performUpdate is like an transaction
+        // error: exception => {
+        //   this.markOutdatedSync(key);
+        //   this.markError(exception, key, include);
+        // },
         after: () => {
           this.flushOutdatedWaitList();
         },
diff --git a/webapp/packages/core-sdk/src/queries/connections/closeConnection.gql b/webapp/packages/core-sdk/src/queries/connections/closeConnection.gql
index 685f91bf64..b0678f2f0d 100644
--- a/webapp/packages/core-sdk/src/queries/connections/closeConnection.gql
+++ b/webapp/packages/core-sdk/src/queries/connections/closeConnection.gql
@@ -1,7 +1,6 @@
 mutation closeConnection(
   $projectId: ID!
   $connectionId: ID!
-
   $includeOrigin: Boolean!
   $customIncludeOriginDetails: Boolean!
   $includeAuthProperties: Boolean!
@@ -10,9 +9,10 @@ mutation closeConnection(
   $includeAuthNeeded: Boolean!
   $includeProperties: Boolean!
   $includeProviderProperties: Boolean!
+  $includeSharedSecrets: Boolean!
   $customIncludeOptions: Boolean!
 ) {
   connection: closeConnection(projectId: $projectId, id: $connectionId) {
     ...DatabaseConnection
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-sdk/src/queries/connections/createConnection.gql b/webapp/packages/core-sdk/src/queries/connections/createConnection.gql
index 79ab6d64db..888eb15480 100644
--- a/webapp/packages/core-sdk/src/queries/connections/createConnection.gql
+++ b/webapp/packages/core-sdk/src/queries/connections/createConnection.gql
@@ -1,7 +1,6 @@
 mutation createConnection(
   $projectId: ID!
   $config: ConnectionConfig!
-
   $includeOrigin: Boolean!
   $customIncludeOriginDetails: Boolean!
   $includeAuthProperties: Boolean!
@@ -10,6 +9,7 @@ mutation createConnection(
   $includeAuthNeeded: Boolean!
   $includeProperties: Boolean!
   $includeProviderProperties: Boolean!
+  $includeSharedSecrets: Boolean!
   $customIncludeOptions: Boolean!
 ) {
   connection: createConnection(projectId: $projectId, config: $config) {
diff --git a/webapp/packages/core-sdk/src/queries/connections/createConnectionFromNode.gql b/webapp/packages/core-sdk/src/queries/connections/createConnectionFromNode.gql
index f58e214591..1e67270c7e 100644
--- a/webapp/packages/core-sdk/src/queries/connections/createConnectionFromNode.gql
+++ b/webapp/packages/core-sdk/src/queries/connections/createConnectionFromNode.gql
@@ -2,7 +2,6 @@ mutation createConnectionFromNode(
   $projectId: ID!
   $nodePath: String!
   $config: ConnectionConfig
-
   $includeOrigin: Boolean!
   $customIncludeOriginDetails: Boolean!
   $includeAuthProperties: Boolean!
@@ -11,6 +10,7 @@ mutation createConnectionFromNode(
   $includeAuthNeeded: Boolean!
   $includeProperties: Boolean!
   $includeProviderProperties: Boolean!
+  $includeSharedSecrets: Boolean!
   $customIncludeOptions: Boolean!
 ) {
   connection: copyConnectionFromNode(projectId: $projectId, nodePath: $nodePath, config: $config) {
diff --git a/webapp/packages/core-sdk/src/queries/connections/createConnectionFromTemplate.gql b/webapp/packages/core-sdk/src/queries/connections/createConnectionFromTemplate.gql
index 064979fa2a..b51d252f19 100644
--- a/webapp/packages/core-sdk/src/queries/connections/createConnectionFromTemplate.gql
+++ b/webapp/packages/core-sdk/src/queries/connections/createConnectionFromTemplate.gql
@@ -2,7 +2,6 @@ mutation createConnectionFromTemplate(
   $projectId: ID!
   $templateId: ID!
   $connectionName: String!
-
   $includeOrigin: Boolean!
   $customIncludeOriginDetails: Boolean!
   $includeAuthProperties: Boolean!
@@ -11,6 +10,7 @@ mutation createConnectionFromTemplate(
   $includeAuthNeeded: Boolean!
   $includeProperties: Boolean!
   $includeProviderProperties: Boolean!
+  $includeSharedSecrets: Boolean!
   $customIncludeOptions: Boolean!
 ) {
   connection: createConnectionFromTemplate(projectId: $projectId, templateId: $templateId, connectionName: $connectionName) {
diff --git a/webapp/packages/core-sdk/src/queries/connections/getTemplateConnections.gql b/webapp/packages/core-sdk/src/queries/connections/getTemplateConnections.gql
index 8db0009b79..5ebee78f97 100644
--- a/webapp/packages/core-sdk/src/queries/connections/getTemplateConnections.gql
+++ b/webapp/packages/core-sdk/src/queries/connections/getTemplateConnections.gql
@@ -8,9 +8,10 @@ query getTemplateConnections(
   $includeAuthNeeded: Boolean!
   $includeProperties: Boolean!
   $includeProviderProperties: Boolean!
+  $includeSharedSecrets: Boolean!
   $customIncludeOptions: Boolean!
 ) {
   connections: templateConnections(projectId: $projectId) {
     ...DatabaseConnection
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-sdk/src/queries/connections/getUserConnections.gql b/webapp/packages/core-sdk/src/queries/connections/getUserConnections.gql
index 11133b175c..83877443b6 100644
--- a/webapp/packages/core-sdk/src/queries/connections/getUserConnections.gql
+++ b/webapp/packages/core-sdk/src/queries/connections/getUserConnections.gql
@@ -10,9 +10,10 @@ query getUserConnections(
   $includeAuthNeeded: Boolean!
   $includeProperties: Boolean!
   $includeProviderProperties: Boolean!
+  $includeSharedSecrets: Boolean!
   $customIncludeOptions: Boolean!
 ) {
   connections: userConnections(projectId: $projectId, id: $connectionId, projectIds: $projectIds) {
     ...DatabaseConnection
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/packages/core-sdk/src/queries/connections/initConnection.gql b/webapp/packages/core-sdk/src/queries/connections/initConnection.gql
index 845a98ddc9..360b91e7c6 100644
--- a/webapp/packages/core-sdk/src/queries/connections/initConnection.gql
+++ b/webapp/packages/core-sdk/src/queries/connections/initConnection.gql
@@ -2,10 +2,10 @@ mutation initConnection(
   $projectId: ID!
   $connectionId: ID!
   $credentials: Object
-  $networkCredentials: [NetworkHandlerConfigInput!] 
+  $networkCredentials: [NetworkHandlerConfigInput!]
   $saveCredentials: Boolean
   $sharedCredentials: Boolean
-
+  $selectedSecretId: String
   $includeOrigin: Boolean!
   $customIncludeOriginDetails: Boolean!
   $includeAuthProperties: Boolean!
@@ -14,6 +14,7 @@ mutation initConnection(
   $includeAuthNeeded: Boolean!
   $includeProperties: Boolean!
   $includeProviderProperties: Boolean!
+  $includeSharedSecrets: Boolean!
   $customIncludeOptions: Boolean!
 ) {
   connection: initConnection(
@@ -21,8 +22,9 @@ mutation initConnection(
     id: $connectionId
     credentials: $credentials
     networkCredentials: $networkCredentials
-    saveCredentials: $saveCredentials,
-    sharedCredentials: $sharedCredentials,
+    saveCredentials: $saveCredentials
+    sharedCredentials: $sharedCredentials
+    selectedSecretId: $selectedSecretId
   ) {
     ...DatabaseConnection
   }
diff --git a/webapp/packages/core-sdk/src/queries/connections/setConnectionNavigatorSettings.gql b/webapp/packages/core-sdk/src/queries/connections/setConnectionNavigatorSettings.gql
index 8a23bdd7a7..9b8703396d 100644
--- a/webapp/packages/core-sdk/src/queries/connections/setConnectionNavigatorSettings.gql
+++ b/webapp/packages/core-sdk/src/queries/connections/setConnectionNavigatorSettings.gql
@@ -2,7 +2,6 @@ mutation setConnectionNavigatorSettings(
   $projectId: ID!
   $connectionId: ID!
   $settings: NavigatorSettingsInput!
-
   $includeOrigin: Boolean!
   $customIncludeOriginDetails: Boolean!
   $includeAuthProperties: Boolean!
@@ -11,6 +10,7 @@ mutation setConnectionNavigatorSettings(
   $includeAuthNeeded: Boolean!
   $includeProperties: Boolean!
   $includeProviderProperties: Boolean!
+  $includeSharedSecrets: Boolean!
   $customIncludeOptions: Boolean!
 ) {
   connection: setConnectionNavigatorSettings(projectId: $projectId, id: $connectionId, settings: $settings) {
diff --git a/webapp/packages/core-sdk/src/queries/connections/updateConnection.gql b/webapp/packages/core-sdk/src/queries/connections/updateConnection.gql
index 5865d13649..101fce9be2 100644
--- a/webapp/packages/core-sdk/src/queries/connections/updateConnection.gql
+++ b/webapp/packages/core-sdk/src/queries/connections/updateConnection.gql
@@ -1,7 +1,6 @@
 mutation updateConnection(
   $projectId: ID!
   $config: ConnectionConfig!
-
   $includeOrigin: Boolean!
   $customIncludeOriginDetails: Boolean!
   $includeAuthProperties: Boolean!
@@ -10,6 +9,7 @@ mutation updateConnection(
   $includeAuthNeeded: Boolean!
   $includeProperties: Boolean!
   $includeProviderProperties: Boolean!
+  $includeSharedSecrets: Boolean!
   $customIncludeOptions: Boolean!
 ) {
   connection: updateConnection(projectId: $projectId, config: $config) {
diff --git a/webapp/packages/core-sdk/src/queries/fragments/DatabaseConnection.gql b/webapp/packages/core-sdk/src/queries/fragments/DatabaseConnection.gql
index f477719d71..62008518d6 100644
--- a/webapp/packages/core-sdk/src/queries/fragments/DatabaseConnection.gql
+++ b/webapp/packages/core-sdk/src/queries/fragments/DatabaseConnection.gql
@@ -37,6 +37,10 @@ fragment DatabaseConnection on ConnectionInfo {
     ...ObjectOriginInfo
   }
 
+  sharedSecrets @include(if: $includeSharedSecrets) {
+    displayName
+    secretId
+  }
   authNeeded @include(if: $includeAuthNeeded)
   authModel
 
diff --git a/webapp/packages/core-ui/src/Tabs/Tab/Tab.tsx b/webapp/packages/core-ui/src/Tabs/Tab/Tab.tsx
index 7601903f6f..ee85b33a7b 100644
--- a/webapp/packages/core-ui/src/Tabs/Tab/Tab.tsx
+++ b/webapp/packages/core-ui/src/Tabs/Tab/Tab.tsx
@@ -6,7 +6,7 @@
  * you may not use this file except in compliance with the License.
  */
 import { observer } from 'mobx-react-lite';
-import { useMemo, useState } from 'react';
+import { useMemo, useRef, useState } from 'react';
 import { Tab as BaseTab } from 'reakit/Tab';
 import styled, { use } from 'reshadow';
 
@@ -27,6 +27,7 @@ import { useTab } from './useTab';
 
 export const Tab = observer<TabProps>(function Tab({ tabId, title, menuContext, disabled, className, children, style, onOpen, onClose, onClick }) {
   const translate = useTranslate();
+  const ref = useRef<HTMLButtonElement>(null);
   const tabContext = useMemo(() => ({ tabId }), [tabId]);
   const tab = useTab(tabId, onOpen, onClose, onClick);
   const info = tab.getInfo();
@@ -46,6 +47,7 @@ export const Tab = observer<TabProps>(function Tab({ tabId, title, menuContext,
             <TabMenu tabId={tabId} state={tab.state} menuContext={menuContext} style={style} />
           </tab-actions>
           <BaseTab
+            ref={ref}
             {...tab.state.state}
             type="button"
             title={translate(title ?? info?.title)}
diff --git a/webapp/packages/core-ui/src/Tabs/TabsState.tsx b/webapp/packages/core-ui/src/Tabs/TabsState.tsx
index 7725edf6ca..bb4f7d5f62 100644
--- a/webapp/packages/core-ui/src/Tabs/TabsState.tsx
+++ b/webapp/packages/core-ui/src/Tabs/TabsState.tsx
@@ -13,7 +13,7 @@ import { useTabState } from 'reakit/Tab';
 import { useAutoLoad, useExecutor, useObjectRef, useObservableRef } from '@cloudbeaver/core-blocks';
 import { useDataContext } from '@cloudbeaver/core-data-context';
 import { Executor, ExecutorInterrupter } from '@cloudbeaver/core-executor';
-import { isDefined, isNull, isUndefined, MetadataMap, MetadataValueGetter } from '@cloudbeaver/core-utils';
+import { isDefined, isNotNullDefined, MetadataMap, MetadataValueGetter } from '@cloudbeaver/core-utils';
 
 import type { ITabData, ITabInfo, ITabsContainer } from './TabsContainer/ITabsContainer';
 import { ITabsContext, type TabDirection, TabsContext } from './TabsContext';
@@ -65,12 +65,6 @@ export const TabsState = observer(function TabsState<T = Record<string, any>>({
     displayed = tabList;
   }
 
-  if (!selectedId && (currentTabId === undefined || currentTabId === null) && autoSelect) {
-    if (displayed.length > 0) {
-      selectedId = displayed[0];
-    }
-  }
-
   const closable = !!onClose;
 
   const [localTabsState] = useState(() => new MetadataMap<string, any>());
@@ -86,7 +80,7 @@ export const TabsState = observer(function TabsState<T = Record<string, any>>({
 
   const dynamic = useObjectRef(
     () => ({
-      selectedId: selectedId || currentTabId,
+      selectedId: state.selectedId,
     }),
     {
       canClose,
@@ -100,30 +94,22 @@ export const TabsState = observer(function TabsState<T = Record<string, any>>({
     },
   );
 
-  if ((!isNull(currentTabId) && !isUndefined(currentTabId)) || !autoSelect) {
+  if (isNotNullDefined(currentTabId)) {
     state.selectedId = currentTabId;
-    dynamic.selectedId = currentTabId;
   }
 
-  if (
-    displayed.length > 0 &&
-    !isNull(dynamic.selectedId) &&
-    !isUndefined(dynamic.selectedId) &&
-    !isNull(selectedId) &&
-    !isUndefined(selectedId) &&
-    autoSelect
-  ) {
-    const tabExists = displayed.includes(dynamic.selectedId);
+  if (displayed.length > 0 && autoSelect) {
+    const tabExists = isNotNullDefined(state.selectedId) && displayed.includes(state.selectedId);
 
     if (!tabExists) {
-      if (displayed.includes(selectedId)) {
-        state.selectedId = selectedId;
-      } else {
-        state.selectedId = displayed[0];
-      }
+      state.selectedId = displayed[0];
     }
   }
 
+  if (isNotNullDefined(currentTabId)) {
+    dynamic.selectedId = state.selectedId;
+  }
+
   useExecutor({
     executor: openExecutor,
     handlers: [
@@ -134,7 +120,10 @@ export const TabsState = observer(function TabsState<T = Record<string, any>>({
           return;
         }
         dynamic.selectedId = data.tabId;
-        dynamic.state.setSelectedId(data.tabId);
+        if (dynamic.state.selectedId !== data.tabId) {
+          dynamic.state.setCurrentId(data.tabId);
+          dynamic.state.setSelectedId(data.tabId);
+        }
       },
     ],
   });
@@ -148,25 +137,18 @@ export const TabsState = observer(function TabsState<T = Record<string, any>>({
     ],
   });
 
+  const currentSelectedId = state.selectedId;
+
   useEffect(() => {
-    if ((!isNull(currentTabId) && !isUndefined(currentTabId)) || !autoSelect) {
+    if (!isNotNullDefined(currentSelectedId) || dynamic.selectedId === currentSelectedId) {
       return;
     }
 
     openExecutor.execute({
-      tabId: state.selectedId!,
+      tabId: currentSelectedId,
       props,
     });
-  }, [currentTabId, state.selectedId, autoSelect]);
-
-  useEffect(() => {
-    if (!isNull(state.selectedId) && !isUndefined(state.selectedId)) {
-      openExecutor.execute({
-        tabId: state.selectedId,
-        props,
-      });
-    }
-  }, [!isNull(state.selectedId) && !isUndefined(state.selectedId)]);
+  }, [currentSelectedId]);
 
   const value = useObservableRef<ITabsContext<T>>(
     () => ({
diff --git a/webapp/packages/core-utils/src/emptyConstants.ts b/webapp/packages/core-utils/src/emptyConstants.ts
new file mode 100644
index 0000000000..edc9b3ffa5
--- /dev/null
+++ b/webapp/packages/core-utils/src/emptyConstants.ts
@@ -0,0 +1,10 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+
+export const EMPTY_ARRAY: ReadonlyArray<any> = Object.freeze([]);
+export const EMPTY_OBJECT: Readonly<Record<any, any>> = Object.freeze({});
diff --git a/webapp/packages/core-utils/src/index.ts b/webapp/packages/core-utils/src/index.ts
index 053616dad3..e5a850255b 100644
--- a/webapp/packages/core-utils/src/index.ts
+++ b/webapp/packages/core-utils/src/index.ts
@@ -8,6 +8,7 @@ export * from './Quadtree/index';
 
 export * from './underscore';
 
+export * from './emptyConstants';
 export * from './base64ToBlob';
 export * from './blobToBase64';
 export * from './base64ToHex';
diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationInfoForm.tsx b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationInfoForm.tsx
index f89c8382e0..0e85707f45 100644
--- a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationInfoForm.tsx
+++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationInfoForm.tsx
@@ -42,8 +42,8 @@ export const ServerConfigurationInfoForm = observer<Props>(function ServerConfig
         name="sessionExpireTime"
         state={state.serverConfig}
         min={1}
-        mapState={v => (v === 0 ? 60000 : v ?? 1800000) / 1000 / 60}
-        mapValue={v => (v === undefined ? 30 : Number(v) || 1) * 1000 * 60}
+        mapState={(v: number | undefined) => String((v === 0 ? 60000 : v ?? 1800000) / 1000 / 60)}
+        mapValue={(v?: string) => (v === undefined ? 30 : Number(v) || 1) * 1000 * 60}
         required
         tiny
       >
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoPart.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoPart.ts
index b51fd1ea33..0912862d4f 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoPart.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoPart.ts
@@ -143,8 +143,8 @@ export class UserFormInfoPart extends FormPart<IUserFormInfoState, IUserFormStat
     const loadableStateContext = this.formState.dataContext.get(DATA_CONTEXT_LOADABLE_STATE);
 
     loadableStateContext.getState('user-info', () => [
-      getCachedDataResourceLoaderState(this.serverConfigResource, undefined),
-      getCachedDataResourceLoaderState(this.authRolesResource, undefined),
+      getCachedDataResourceLoaderState(this.serverConfigResource, () => undefined),
+      getCachedDataResourceLoaderState(this.authRolesResource, () => undefined),
     ]);
   }
 
diff --git a/webapp/packages/plugin-connection-template/src/TemplateConnectionPluginBootstrap.ts b/webapp/packages/plugin-connection-template/src/TemplateConnectionPluginBootstrap.ts
index 4d4767e101..55869f8143 100644
--- a/webapp/packages/plugin-connection-template/src/TemplateConnectionPluginBootstrap.ts
+++ b/webapp/packages/plugin-connection-template/src/TemplateConnectionPluginBootstrap.ts
@@ -6,6 +6,7 @@
  * you may not use this file except in compliance with the License.
  */
 import { AppAuthService } from '@cloudbeaver/core-authentication';
+import { importLazyComponent } from '@cloudbeaver/core-blocks';
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService } from '@cloudbeaver/core-dialogs';
 import { ProjectInfoResource, ProjectsService } from '@cloudbeaver/core-projects';
@@ -14,10 +15,11 @@ import { ActionService, DATA_CONTEXT_MENU, MenuService } from '@cloudbeaver/core
 import { MENU_CONNECTIONS } from '@cloudbeaver/plugin-connections';
 
 import { ACTION_CONNECTION_TEMPLATE } from './Actions/ACTION_CONNECTION_TEMPLATE';
-import { ConnectionDialog } from './ConnectionDialog/ConnectionDialog';
 import { TemplateConnectionsResource } from './TemplateConnectionsResource';
 import { TemplateConnectionsService } from './TemplateConnectionsService';
 
+const ConnectionDialog = importLazyComponent(() => import('./ConnectionDialog/ConnectionDialog').then(m => m.ConnectionDialog));
+
 @injectable()
 export class TemplateConnectionPluginBootstrap extends Bootstrap {
   constructor(
@@ -46,13 +48,15 @@ export class TemplateConnectionPluginBootstrap extends Bootstrap {
         !this.appAuthService.authenticated ||
         !this.projectsService.userProject?.canEditDataSources ||
         !this.templateConnectionsService.projectTemplates.length,
-      getLoader: (context, action) => {
-        return [
-          ...this.appAuthService.loaders,
-          getCachedMapResourceLoaderState(this.projectInfoResource, () => CachedMapAllKey),
-          getCachedDataResourceLoaderState(this.templateConnectionsResource, undefined, undefined),
-        ];
-      },
+      getLoader: () => [
+        ...this.appAuthService.loaders,
+        getCachedMapResourceLoaderState(this.projectInfoResource, () => CachedMapAllKey),
+        getCachedDataResourceLoaderState(
+          this.templateConnectionsResource,
+          () => undefined,
+          () => undefined,
+        ),
+      ],
       handler: async (context, action) => {
         switch (action) {
           case ACTION_CONNECTION_TEMPLATE: {
diff --git a/webapp/packages/plugin-connection-template/src/TemplateConnectionsResource.ts b/webapp/packages/plugin-connection-template/src/TemplateConnectionsResource.ts
index d82f877b7d..f9fc69210e 100644
--- a/webapp/packages/plugin-connection-template/src/TemplateConnectionsResource.ts
+++ b/webapp/packages/plugin-connection-template/src/TemplateConnectionsResource.ts
@@ -68,6 +68,7 @@ export class TemplateConnectionsResource extends CachedDataResource<Connection[]
       includeCredentialsSaved: false,
       includeProperties: false,
       includeProviderProperties: false,
+      includeSharedSecrets: false,
       customIncludeOptions: false,
     });
     return connections;
diff --git a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessTabService.ts b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessTabService.ts
index 26523da307..427066a173 100644
--- a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessTabService.ts
+++ b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessTabService.ts
@@ -12,7 +12,7 @@ import { ConnectionInfoResource, createConnectionParam, IConnectionInfoParams }
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { executorHandlerFilter, IExecutionContextProvider } from '@cloudbeaver/core-executor';
 import { isGlobalProject, ProjectInfoResource } from '@cloudbeaver/core-projects';
-import { PermissionsService, EAdminPermission } from '@cloudbeaver/core-root';
+import { EAdminPermission, PermissionsService } from '@cloudbeaver/core-root';
 import { formStateContext } from '@cloudbeaver/core-ui';
 import type { MetadataValueGetter } from '@cloudbeaver/core-utils';
 import {
diff --git a/webapp/packages/plugin-connections/src/ConnectionAuthService.ts b/webapp/packages/plugin-connections/src/ConnectionAuthService.ts
index 79e610752d..2e655f1ada 100644
--- a/webapp/packages/plugin-connections/src/ConnectionAuthService.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionAuthService.ts
@@ -6,20 +6,21 @@
  * you may not use this file except in compliance with the License.
  */
 import { AuthProviderService } from '@cloudbeaver/core-authentication';
+import { importLazyComponent } from '@cloudbeaver/core-blocks';
 import {
   Connection,
   ConnectionInfoResource,
   ConnectionsManagerService,
   createConnectionParam,
   IConnectionInfoParams,
+  IRequireConnectionExecutorData,
 } from '@cloudbeaver/core-connections';
 import { Dependency, injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService, DialogueStateResult } from '@cloudbeaver/core-dialogs';
-import { NotificationService } from '@cloudbeaver/core-events';
 import type { IExecutionContextProvider } from '@cloudbeaver/core-executor';
 import { AuthenticationService } from '@cloudbeaver/plugin-authentication';
 
-import { DatabaseAuthDialog } from './DatabaseAuthDialog/DatabaseAuthDialog';
+const DatabaseAuthDialog = importLazyComponent(() => import('./DatabaseAuthDialog/DatabaseAuthDialog').then(m => m.DatabaseAuthDialog));
 
 @injectable()
 export class ConnectionAuthService extends Dependency {
@@ -28,7 +29,6 @@ export class ConnectionAuthService extends Dependency {
     private readonly commonDialogService: CommonDialogService,
     private readonly authProviderService: AuthProviderService,
     private readonly connectionsManagerService: ConnectionsManagerService,
-    private readonly notificationService: NotificationService,
     private readonly authenticationService: AuthenticationService,
   ) {
     super();
@@ -40,10 +40,10 @@ export class ConnectionAuthService extends Dependency {
     }));
   }
 
-  private async connectionDialog(connectionKey: IConnectionInfoParams, context: IExecutionContextProvider<IConnectionInfoParams | null>) {
+  private async connectionDialog(data: IRequireConnectionExecutorData, context: IExecutionContextProvider<IRequireConnectionExecutorData | null>) {
     const connection = context.getContext(this.connectionsManagerService.connectionContext);
 
-    const newConnection = await this.auth(connectionKey);
+    const newConnection = await this.auth(data.key, data.resetCredentials);
 
     if (!newConnection?.connected) {
       return;
@@ -51,7 +51,7 @@ export class ConnectionAuthService extends Dependency {
     connection.connection = newConnection;
   }
 
-  async auth(key: IConnectionInfoParams, resetCredentials?: boolean): Promise<Connection | null> {
+  private async auth(key: IConnectionInfoParams, resetCredentials?: boolean): Promise<Connection | null> {
     if (!this.connectionInfoResource.has(key)) {
       return null;
     }
diff --git a/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationDialogLoader.ts b/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationDialogLoader.ts
new file mode 100644
index 0000000000..f44390ca48
--- /dev/null
+++ b/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationDialogLoader.ts
@@ -0,0 +1,12 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { importLazyComponent } from '@cloudbeaver/core-blocks';
+
+export const ConnectionAuthenticationDialogLoader = importLazyComponent(() =>
+  import('./ConnectionAuthenticationDialog').then(module => module.ConnectionAuthenticationDialog),
+);
diff --git a/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationDialogLoader.tsx b/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationDialogLoader.tsx
deleted file mode 100644
index 2449ee5236..0000000000
--- a/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationDialogLoader.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2024 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0.
- * you may not use this file except in compliance with the License.
- */
-import React from 'react';
-
-export const ConnectionAuthenticationDialogLoader = React.lazy(async () => {
-  const { ConnectionAuthenticationDialog } = await import('./ConnectionAuthenticationDialog');
-  return { default: ConnectionAuthenticationDialog };
-});
diff --git a/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationFormLoader.ts b/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationFormLoader.ts
new file mode 100644
index 0000000000..d0fa37b6bf
--- /dev/null
+++ b/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationFormLoader.ts
@@ -0,0 +1,12 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { importLazyComponent } from '@cloudbeaver/core-blocks';
+
+export const ConnectionAuthenticationFormLoader = importLazyComponent(() =>
+  import('./ConnectionAuthenticationForm').then(m => m.ConnectionAuthenticationForm),
+);
diff --git a/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationFormLoader.tsx b/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationFormLoader.tsx
deleted file mode 100644
index 500f5cb357..0000000000
--- a/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationFormLoader.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2024 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0.
- * you may not use this file except in compliance with the License.
- */
-import React from 'react';
-
-export const ConnectionAuthenticationFormLoader = React.lazy(async () => {
-  const { ConnectionAuthenticationForm } = await import('./ConnectionAuthenticationForm');
-  return { default: ConnectionAuthenticationForm };
-});
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionAuthModelCredentials/ConnectionAuthModelCredentialsForm.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionAuthModelCredentials/ConnectionAuthModelCredentialsForm.tsx
new file mode 100644
index 0000000000..a68871cf0f
--- /dev/null
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionAuthModelCredentials/ConnectionAuthModelCredentialsForm.tsx
@@ -0,0 +1,44 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { observer } from 'mobx-react-lite';
+
+import { Container, ObjectPropertyInfoForm } from '@cloudbeaver/core-blocks';
+import type { ObjectPropertyInfo } from '@cloudbeaver/core-sdk';
+import { isSafari } from '@cloudbeaver/core-utils';
+
+interface Props {
+  credentials?: Record<string, any>;
+  defaultCredentials?: Record<string, any>;
+  properties: ReadonlyArray<ObjectPropertyInfo>;
+  readonly?: boolean;
+  disabled?: boolean;
+}
+
+export const ConnectionAuthModelCredentialsForm = observer<Props>(function ConnectionAuthModelCredentialsForm({
+  credentials,
+  defaultCredentials,
+  properties,
+  readonly,
+  disabled,
+}) {
+  return (
+    <Container wrap gap hideEmpty>
+      <ObjectPropertyInfoForm
+        autofillToken={isSafari ? 'section-connection-authentication section-secrets' : 'new-password'}
+        properties={properties}
+        state={credentials}
+        defaultState={defaultCredentials}
+        disabled={disabled}
+        readOnly={readonly}
+        showRememberTip
+        hideEmptyPlaceholder
+        tiny
+      />
+    </Container>
+  );
+});
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionAuthModelCredentials/ConnectionAuthModelSelector.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionAuthModelCredentials/ConnectionAuthModelSelector.tsx
new file mode 100644
index 0000000000..7bf26ceff1
--- /dev/null
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionAuthModelCredentials/ConnectionAuthModelSelector.tsx
@@ -0,0 +1,63 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { observer } from 'mobx-react-lite';
+
+import { Combobox, usePermission, useResource } from '@cloudbeaver/core-blocks';
+import { DatabaseAuthModelsResource } from '@cloudbeaver/core-connections';
+import { CachedResourceListEmptyKey, resourceKeyList } from '@cloudbeaver/core-resource';
+import { EAdminPermission } from '@cloudbeaver/core-root';
+import { isNotNullDefined } from '@cloudbeaver/core-utils';
+
+interface Props {
+  authModelCredentialsState: { authModelId?: string };
+  applicableAuthModels: string[];
+  readonlyAuthModelId?: boolean;
+  readonly?: boolean;
+  disabled?: boolean;
+  onAuthModelChange?: (authModelId: string | undefined) => void;
+}
+
+export const ConnectionAuthModelSelector = observer<Props>(function ConnectionAuthModelSelector({
+  authModelCredentialsState,
+  applicableAuthModels,
+  onAuthModelChange,
+  readonlyAuthModelId,
+  readonly,
+  disabled,
+}) {
+  const adminPermission = usePermission(EAdminPermission.admin);
+
+  const authModelsLoader = useResource(
+    ConnectionAuthModelSelector,
+    DatabaseAuthModelsResource,
+    applicableAuthModels.length ? resourceKeyList(applicableAuthModels) : CachedResourceListEmptyKey,
+  );
+
+  const availableAuthModels = authModelsLoader.data.filter(isNotNullDefined).filter(model => adminPermission || !model.requiresLocalConfiguration);
+
+  if (availableAuthModels.length <= 1) {
+    return null;
+  }
+
+  return (
+    <Combobox
+      name="authModelId"
+      state={authModelCredentialsState}
+      items={availableAuthModels}
+      keySelector={model => model.id}
+      valueSelector={model => model.displayName}
+      titleSelector={model => model.description}
+      searchable={availableAuthModels.length > 10}
+      readOnly={readonly || readonlyAuthModelId}
+      disabled={disabled}
+      tiny
+      fill
+      onSelect={onAuthModelChange}
+    />
+  );
+});
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionForm.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionForm.tsx
index 44d1634815..429f1a13f4 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionForm.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionForm.tsx
@@ -15,11 +15,11 @@ import { ENotificationType } from '@cloudbeaver/core-events';
 import type { ConnectionConfig } from '@cloudbeaver/core-sdk';
 import { BASE_TAB_STYLES, TabList, TabPanelList, TabsState, UNDERLINE_TAB_BIG_STYLES, UNDERLINE_TAB_STYLES } from '@cloudbeaver/core-ui';
 
+import { ConnectionFormActionsContext, IConnectionFormActionsContext } from './ConnectFormActionsContext';
+import connectionFormStyles from './ConnectionForm.m.css';
 import { ConnectionFormService } from './ConnectionFormService';
 import { connectionConfigContext } from './Contexts/connectionConfigContext';
 import type { IConnectionFormState } from './IConnectionFormProps';
-import connectionFormStyles from './ConnectionForm.m.css';
-import { ConnectionFormActionsContext, IConnectionFormActionsContext } from './ConnectFormActionsContext';
 
 const tabsStyles = css`
   TabList {
@@ -108,7 +108,7 @@ export const ConnectionForm = observer<ConnectionFormProps>(function ConnectionF
   const style = [BASE_TAB_STYLES, tabsStyles, UNDERLINE_TAB_STYLES, UNDERLINE_TAB_BIG_STYLES];
   const styles = useStyles(style, topBarStyles, formStyles);
   const service = useService(ConnectionFormService);
-  
+
   const form = useForm({
     onSubmit: event => {
       if (event?.type === 'test') {
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormBaseActions.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormBaseActions.tsx
index bb34fa1638..0a98724dc5 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormBaseActions.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormBaseActions.tsx
@@ -11,6 +11,7 @@ import { useContext } from 'react';
 import { AUTH_PROVIDER_LOCAL_ID } from '@cloudbeaver/core-authentication';
 import { Button, getComputed, PlaceholderComponent, useResource, useTranslate } from '@cloudbeaver/core-blocks';
 import { DatabaseAuthModelsResource, DBDriverResource } from '@cloudbeaver/core-connections';
+import { ServerConfigResource } from '@cloudbeaver/core-root';
 import { useAuthenticationAction } from '@cloudbeaver/core-ui';
 
 import { ConnectionFormActionsContext } from './ConnectFormActionsContext';
@@ -30,6 +31,7 @@ export const ConnectionFormBaseActions: PlaceholderComponent<IConnectionFormProp
   const driverMap = useResource(ConnectionFormBaseActions, DBDriverResource, state.config.driverId || null);
 
   const driver = driverMap.data;
+  const serverConfigResource = useResource(ConnectionFormBaseActions, ServerConfigResource, undefined);
   const { data: authModel } = useResource(
     ConnectionFormBaseActions,
     DatabaseAuthModelsResource,
@@ -40,6 +42,7 @@ export const ConnectionFormBaseActions: PlaceholderComponent<IConnectionFormProp
   });
 
   const authorized = authentication.providerId === AUTH_PROVIDER_LOCAL_ID || authentication.authorized;
+  const disableTest = serverConfigResource.data?.distributed && !!state.config.sharedCredentials;
 
   return (
     <>
@@ -48,9 +51,11 @@ export const ConnectionFormBaseActions: PlaceholderComponent<IConnectionFormProp
           {translate('ui_processing_cancel')}
         </Button>
       )}
-      <Button type="button" disabled={state.disabled || !authorized} mod={['outlined']} loader onClick={actions.test}>
-        {translate('connections_connection_test')}
-      </Button>
+      {!disableTest && (
+        <Button type="button" disabled={state.disabled || !authorized} mod={['outlined']} loader onClick={actions.test}>
+          {translate('connections_connection_test')}
+        </Button>
+      )}
       <Button type="button" disabled={state.disabled || state.readonly} mod={['unelevated']} loader onClick={actions.save}>
         {translate(state.mode === 'edit' ? 'ui_processing_save' : 'ui_processing_create')}
       </Button>
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/Options/ConnectionOptionsTabService.ts b/webapp/packages/plugin-connections/src/ConnectionForm/Options/ConnectionOptionsTabService.ts
index e886f75a31..86c45f8abd 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/Options/ConnectionOptionsTabService.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/Options/ConnectionOptionsTabService.ts
@@ -316,8 +316,8 @@ export class ConnectionOptionsTabService extends Bootstrap {
 
     if ((state.config.authModelId || driver.defaultAuthModel) && !driver.anonymousAccess) {
       tempConfig.authModelId = state.config.authModelId || driver.defaultAuthModel;
-      tempConfig.saveCredentials = state.config.saveCredentials;
       tempConfig.sharedCredentials = state.config.sharedCredentials;
+      tempConfig.saveCredentials = state.config.saveCredentials || tempConfig.sharedCredentials;
 
       const properties = await this.getConnectionAuthModelProperties(tempConfig.authModelId, state.info);
 
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/Options/Options.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/Options/Options.tsx
index ec25a5f123..12fa37d88d 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/Options/Options.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/Options/Options.tsx
@@ -6,7 +6,7 @@
  * you may not use this file except in compliance with the License.
  */
 import { observer } from 'mobx-react-lite';
-import { useCallback, useRef } from 'react';
+import { useContext, useRef } from 'react';
 
 import { AUTH_PROVIDER_LOCAL_ID } from '@cloudbeaver/core-authentication';
 import {
@@ -20,29 +20,29 @@ import {
   Group,
   GroupTitle,
   InputField,
-  ObjectPropertyInfoForm,
+  Link,
   Radio,
   RadioGroup,
   s,
   Textarea,
   useAdministrationSettings,
   useFormValidator,
-  usePermission,
   useResource,
   useS,
   useTranslate,
 } from '@cloudbeaver/core-blocks';
 import { DatabaseAuthModelsResource, DBDriverResource, isLocalConnection } from '@cloudbeaver/core-connections';
 import { useService } from '@cloudbeaver/core-di';
-import { CachedResourceListEmptyKey, resourceKeyList } from '@cloudbeaver/core-resource';
-import { EAdminPermission, ServerConfigResource } from '@cloudbeaver/core-root';
+import { ServerConfigResource } from '@cloudbeaver/core-root';
 import { DriverConfigurationType } from '@cloudbeaver/core-sdk';
-import { type TabContainerPanelComponent, useAuthenticationAction } from '@cloudbeaver/core-ui';
-import { isSafari } from '@cloudbeaver/core-utils';
+import { type TabContainerPanelComponent, TabsContext, useAuthenticationAction } from '@cloudbeaver/core-ui';
 import { ProjectSelect } from '@cloudbeaver/plugin-projects';
 
+import { ConnectionAuthModelCredentialsForm } from '../ConnectionAuthModelCredentials/ConnectionAuthModelCredentialsForm';
+import { ConnectionAuthModelSelector } from '../ConnectionAuthModelCredentials/ConnectionAuthModelSelector';
 import { ConnectionFormService } from '../ConnectionFormService';
 import type { IConnectionFormProps } from '../IConnectionFormProps';
+import { CONNECTION_FORM_SHARED_CREDENTIALS_TAB_ID } from '../SharedCredentials/CONNECTION_FORM_SHARED_CREDENTIALS_TAB_ID';
 import { ConnectionOptionsTabService } from './ConnectionOptionsTabService';
 import styles from './Options.m.css';
 import { ParametersForm } from './ParametersForm';
@@ -77,26 +77,15 @@ export const Options: TabContainerPanelComponent<IConnectionFormProps> = observe
   const translate = useTranslate();
   const { info, config, availableDrivers, submittingTask: submittingHandlers, disabled } = state;
   const style = useS(styles);
+  const tabsState = useContext(TabsContext);
 
   //@TODO it's here until the profile implementation in the CloudBeaver
   const readonly = state.readonly || info?.authModel === PROFILE_AUTH_MODEL_ID;
 
-  const adminPermission = usePermission(EAdminPermission.admin);
-
   useFormValidator(submittingHandlers.for(service.formValidationTask), formRef.current);
   const optionsHook = useOptions(state);
   const { credentialsSavingEnabled } = useAdministrationSettings();
 
-  const handleAuthModelSelect = useCallback(async (value?: string, name?: string, prev?: string) => {
-    const model = applicableAuthModels.find(model => model?.id === value);
-
-    if (!model) {
-      return;
-    }
-
-    optionsHook.setAuthModel(model);
-  }, []);
-
   const driverMap = useResource(
     Options,
     DBDriverResource,
@@ -119,25 +108,11 @@ export const Options: TabContainerPanelComponent<IConnectionFormProps> = observe
     if (config.template) {
       config.folder = undefined;
     }
-
-    if (name === 'sharedCredentials' && value) {
-      config.saveCredentials = true;
-
-      for (const handler of config.networkHandlersConfig ?? []) {
-        if (!handler.savePassword) {
-          handler.savePassword = true;
-        }
-      }
-    }
   }
 
-  const { data: applicableAuthModels } = useResource(
-    Options,
-    DatabaseAuthModelsResource,
-    driver?.applicableAuthModels ? resourceKeyList(driver.applicableAuthModels) : CachedResourceListEmptyKey,
-  );
+  const applicableAuthModels = driver?.applicableAuthModels ?? [];
 
-  const { data: authModel } = useResource(
+  const authModelLoader = useResource(
     Options,
     DatabaseAuthModelsResource,
     getComputed(() => config.authModelId || info?.authModel || driver?.defaultAuthModel || null),
@@ -146,6 +121,22 @@ export const Options: TabContainerPanelComponent<IConnectionFormProps> = observe
     },
   );
 
+  const authModel = authModelLoader.data;
+
+  async function handleAuthModelSelect(id: string | undefined) {
+    if (!id) {
+      return;
+    }
+
+    const model = await authModelLoader.resource.load(id);
+
+    if (!model) {
+      return;
+    }
+
+    optionsHook.setAuthModel(model);
+  }
+
   const authentication = useAuthenticationAction({
     providerId: authModel?.requiredAuth ?? info?.requiredAuth ?? AUTH_PROVIDER_LOCAL_ID,
   });
@@ -154,7 +145,6 @@ export const Options: TabContainerPanelComponent<IConnectionFormProps> = observe
   const edit = state.mode === 'edit';
   const originLocal = !info || isLocalConnection(info);
 
-  const availableAuthModels = applicableAuthModels.filter(model => !!model && (adminPermission || !model.requiresLocalConfiguration));
   const drivers = driverMap.resource.enabledDrivers.filter(({ id }) => availableDrivers.includes(id));
 
   let properties = authModel?.properties;
@@ -163,6 +153,13 @@ export const Options: TabContainerPanelComponent<IConnectionFormProps> = observe
     properties = info.authProperties;
   }
 
+  const sharedCredentials = config.sharedCredentials && serverConfigResource.data?.distributed;
+
+  function openCredentialsTab(event: React.MouseEvent<HTMLAnchorElement>) {
+    event.preventDefault();
+    tabsState?.open(CONNECTION_FORM_SHARED_CREDENTIALS_TAB_ID);
+  }
+
   return (
     <Form ref={formRef} className={s(style, { form: true })} disabled={driverMap.isLoading()} onChange={handleFormChange}>
       <ColoredContainer wrap overflow parent gap>
@@ -285,63 +282,56 @@ export const Options: TabContainerPanelComponent<IConnectionFormProps> = observe
           {!driver?.anonymousAccess && (authentication.authorized || !edit) && (
             <Group form gap>
               <GroupTitle>{translate('connections_connection_edit_authentication')}</GroupTitle>
-              {availableAuthModels.length > 1 && (
-                <Combobox
-                  name="authModelId"
+              {serverConfigResource.resource.distributed && connectionOptionsTabService.isProjectShared(state) && (
+                <FieldCheckbox
+                  id={config.connectionId + 'isShared'}
+                  name="sharedCredentials"
+                  title={translate('connections_connection_share_credentials_tooltip')}
                   state={config}
-                  items={availableAuthModels}
-                  keySelector={model => model!.id}
-                  valueSelector={model => model!.displayName}
-                  titleSelector={model => model?.description}
-                  searchable={availableAuthModels.length > 10}
-                  readOnly={readonly || !originLocal}
-                  disabled={disabled}
-                  tiny
-                  fill
-                  onSelect={handleAuthModelSelect}
-                />
+                  disabled={disabled || readonly}
+                  keepSize
+                >
+                  {translate('connections_connection_share_credentials')}
+                </FieldCheckbox>
               )}
-              {authModel && properties && (
+              <ConnectionAuthModelSelector
+                authModelCredentialsState={config}
+                applicableAuthModels={applicableAuthModels}
+                readonlyAuthModelId={!originLocal}
+                readonly={readonly}
+                disabled={disabled}
+                onAuthModelChange={handleAuthModelSelect}
+              />
+              {!sharedCredentials ? (
                 <>
-                  <Container wrap gap hideEmpty>
-                    <ObjectPropertyInfoForm
-                      autofillToken={isSafari ? 'section-connection-authentication section-options' : 'new-password'}
+                  {properties && (
+                    <ConnectionAuthModelCredentialsForm
+                      credentials={config.credentials}
                       properties={properties}
-                      state={config.credentials}
+                      readonly={readonly}
                       disabled={disabled}
-                      readOnly={readonly}
-                      showRememberTip
-                      hideEmptyPlaceholder
-                      tiny
                     />
-                  </Container>
-                  {credentialsSavingEnabled && !config.template && (
-                    <Container wrap gap>
-                      <FieldCheckbox
-                        id={config.connectionId + 'authNeeded'}
-                        name="saveCredentials"
-                        state={config}
-                        disabled={disabled || readonly || config.sharedCredentials}
-                        mod={['primary']}
-                        keepSize
-                      >
-                        {translate('connections_connection_edit_save_credentials')}
-                      </FieldCheckbox>
-                      {serverConfigResource.resource.distributed && connectionOptionsTabService.isProjectShared(state) && (
-                        <FieldCheckbox
-                          id={config.connectionId + 'isShared'}
-                          name="sharedCredentials"
-                          title={translate('connections_connection_share_credentials_tooltip')}
-                          state={config}
-                          disabled={disabled || readonly}
-                          keepSize
-                        >
-                          {translate('connections_connection_share_credentials')}
-                        </FieldCheckbox>
-                      )}
-                    </Container>
                   )}
                 </>
+              ) : (
+                <FormFieldDescription>
+                  {translate('plugin_connections_connection_form_shared_credentials_manage_info')}
+                  <Link inline onClick={openCredentialsTab}>
+                    {translate('plugin_connections_connection_form_shared_credentials_manage_info_tab_link')}
+                  </Link>
+                </FormFieldDescription>
+              )}
+              {!sharedCredentials && authModel && credentialsSavingEnabled && !config.template && (
+                <FieldCheckbox
+                  id={config.connectionId + 'authNeeded'}
+                  name="saveCredentials"
+                  state={config}
+                  disabled={disabled || readonly || config.sharedCredentials}
+                  mod={['primary']}
+                  keepSize
+                >
+                  {translate('connections_connection_edit_save_credentials')}
+                </FieldCheckbox>
               )}
             </Group>
           )}
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/ConnectionSSHTabService.ts b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/ConnectionSSHTabService.ts
index 927eb5ad68..6a0c8dbef4 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/ConnectionSSHTabService.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/ConnectionSSHTabService.ts
@@ -176,6 +176,7 @@ export class ConnectionSSHTabService extends Bootstrap {
     if (this.isChanged(handler, initial) || passwordChanged || keyChanged) {
       handlerConfig = {
         ...handler,
+        savePassword: handler.savePassword || config.sharedCredentials,
         key: handler.authType === NetworkHandlerAuthType.PublicKey && keyChanged ? handler.key : undefined,
         password: passwordChanged ? handler.password : undefined,
       };
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
index 4e8ffb20af..8c594677d3 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
@@ -147,13 +147,8 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({ st
             </InputField>
             {keyAuth && <SSHKeyUploader state={handlerState} saved={keySaved} disabled={disabled || !enabled} readonly={readonly} />}
           </Container>
-          {credentialsSavingEnabled && !formState.config.template && (
-            <FieldCheckbox
-              id={SSH_TUNNEL_ID + '_savePassword'}
-              name="savePassword"
-              state={handlerState}
-              disabled={disabled || !enabled || readonly || formState.config.sharedCredentials}
-            >
+          {credentialsSavingEnabled && !formState.config.template && !formState.config.sharedCredentials && (
+            <FieldCheckbox id={SSH_TUNNEL_ID + '_savePassword'} name="savePassword" state={handlerState} disabled={disabled || !enabled || readonly}>
               {translate('connections_connection_edit_save_credentials')}
             </FieldCheckbox>
           )}
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSL/ConnectionSSLTabService.ts b/webapp/packages/plugin-connections/src/ConnectionForm/SSL/ConnectionSSLTabService.ts
index dd3df9c23e..34c58c1551 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSL/ConnectionSSLTabService.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSL/ConnectionSSLTabService.ts
@@ -136,6 +136,7 @@ export class ConnectionSSLTabService extends Bootstrap {
 
     const initial = state.info?.networkHandlersConfig?.find(h => h.id === handler.id);
     const handlerConfig: NetworkHandlerConfigInput = toJS(handler);
+    handlerConfig.savePassword = handler.savePassword || config.sharedCredentials;
 
     const changed = this.isChanged(handlerConfig, initial);
 
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSL/SSL.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/SSL/SSL.tsx
index cc86b30ebc..68f75ea1fc 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSL/SSL.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSL/SSL.tsx
@@ -102,7 +102,7 @@ export const SSL: TabContainerPanelComponent<Props> = observer(function SSL({ st
             </React.Fragment>
           ))}
 
-          {credentialsSavingEnabled && !formState.config.template && (
+          {credentialsSavingEnabled && !formState.config.template && !formState.config.sharedCredentials && (
             <FieldCheckbox
               id={handler.id + '_savePassword'}
               name="savePassword"
diff --git a/webapp/packages/core-connections/src/IConnectionsResource.ts b/webapp/packages/plugin-connections/src/ConnectionForm/SharedCredentials/CONNECTION_FORM_SHARED_CREDENTIALS_TAB_ID.ts
similarity index 71%
rename from webapp/packages/core-connections/src/IConnectionsResource.ts
rename to webapp/packages/plugin-connections/src/ConnectionForm/SharedCredentials/CONNECTION_FORM_SHARED_CREDENTIALS_TAB_ID.ts
index 56d356cc78..e5ea0bb354 100644
--- a/webapp/packages/core-connections/src/IConnectionsResource.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SharedCredentials/CONNECTION_FORM_SHARED_CREDENTIALS_TAB_ID.ts
@@ -6,7 +6,4 @@
  * you may not use this file except in compliance with the License.
  */
 
-export interface IConnectionInfoParams {
-  projectId: string;
-  connectionId: string;
-}
+export const CONNECTION_FORM_SHARED_CREDENTIALS_TAB_ID = 'shared_credentials';
diff --git a/webapp/packages/plugin-connections/src/ContextMenu/ConnectionMenuBootstrap.ts b/webapp/packages/plugin-connections/src/ContextMenu/ConnectionMenuBootstrap.ts
index 713af2e3a1..babbe9bfbf 100644
--- a/webapp/packages/plugin-connections/src/ContextMenu/ConnectionMenuBootstrap.ts
+++ b/webapp/packages/plugin-connections/src/ContextMenu/ConnectionMenuBootstrap.ts
@@ -28,7 +28,6 @@ import {
 import { ACTION_DELETE, ActionService, DATA_CONTEXT_MENU, DATA_CONTEXT_MENU_NESTED, MenuSeparatorItem, MenuService } from '@cloudbeaver/core-view';
 import { MENU_APP_ACTIONS } from '@cloudbeaver/plugin-top-app-bar';
 
-import { ConnectionAuthService } from '../ConnectionAuthService';
 import { PluginConnectionsSettingsService } from '../PluginConnectionsSettingsService';
 import { PublicConnectionFormService } from '../PublicConnectionForm/PublicConnectionFormService';
 import { ACTION_CONNECTION_CHANGE_CREDENTIALS } from './Actions/ACTION_CONNECTION_CHANGE_CREDENTIALS';
@@ -54,7 +53,6 @@ export class ConnectionMenuBootstrap extends Bootstrap {
     private readonly connectionsSettingsService: ConnectionsSettingsService,
     private readonly pluginConnectionsSettingsService: PluginConnectionsSettingsService,
     private readonly permissionsService: PermissionsService,
-    private readonly connectionAuthService: ConnectionAuthService,
     private readonly serverConfigResource: ServerConfigResource,
   ) {
     super();
@@ -192,7 +190,7 @@ export class ConnectionMenuBootstrap extends Bootstrap {
         }
 
         if (action === ACTION_CONNECTION_CHANGE_CREDENTIALS) {
-          return this.serverConfigResource.distributed;
+          return this.serverConfigResource.distributed && !connection.sharedCredentials;
         }
 
         return false;
@@ -245,7 +243,7 @@ export class ConnectionMenuBootstrap extends Bootstrap {
             break;
           }
           case ACTION_CONNECTION_CHANGE_CREDENTIALS: {
-            await this.connectionAuthService.auth({ connectionId: connection.id, projectId: connection.projectId }, true);
+            await this.connectionsManagerService.requireConnection({ connectionId: connection.id, projectId: connection.projectId }, true);
             break;
           }
         }
diff --git a/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseAuthDialog.tsx b/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseAuthDialog.tsx
index 5f4ab641c9..9c2087f605 100644
--- a/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseAuthDialog.tsx
+++ b/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseAuthDialog.tsx
@@ -7,29 +7,12 @@
  */
 import { observer } from 'mobx-react-lite';
 
-import {
-  CommonDialogBody,
-  CommonDialogFooter,
-  CommonDialogHeader,
-  CommonDialogWrapper,
-  ErrorMessage,
-  Form,
-  Loader,
-  s,
-  useAdministrationSettings,
-  useAutoLoad,
-  useErrorDetails,
-  useFocus,
-  useS,
-  useTranslate,
-} from '@cloudbeaver/core-blocks';
-import type { IConnectionInfoParams } from '@cloudbeaver/core-connections';
+import { CommonDialogHeader, CommonDialogWrapper, useResource, useTranslate } from '@cloudbeaver/core-blocks';
+import { ConnectionInfoResource, DBDriverResource, type IConnectionInfoParams } from '@cloudbeaver/core-connections';
 import type { DialogComponent } from '@cloudbeaver/core-dialogs';
 
-import { ConnectionAuthenticationFormLoader } from '../ConnectionAuthentication/ConnectionAuthenticationFormLoader';
-import style from './DatabaseAuthDialog.m.css';
-import { DBAuthDialogFooter } from './DBAuthDialogFooter';
-import { useDatabaseAuthDialog } from './useDatabaseAuthDialog';
+import { DatabaseCredentialsAuthDialog } from './DatabaseCredentialsAuthDialog/DatabaseCredentialsAuthDialog';
+import { DatabaseSecretAuthDialog } from './DatabaseSecretAuthDialog/DatabaseSecretAuthDialog';
 
 interface Payload {
   connection: IConnectionInfoParams;
@@ -38,53 +21,38 @@ interface Payload {
 }
 
 export const DatabaseAuthDialog: DialogComponent<Payload> = observer(function DatabaseAuthDialog({ payload, options, rejectDialog, resolveDialog }) {
-  const styles = useS(style);
+  const connectionInfoLoader = useResource(DatabaseAuthDialog, ConnectionInfoResource, {
+    key: payload.connection,
+    includes: ['includeAuthNeeded', 'includeSharedSecrets', 'includeNetworkHandlersConfig', 'includeCredentialsSaved'],
+  });
   const translate = useTranslate();
-  const [focusedRef] = useFocus<HTMLFormElement>({ focusFirstChild: true });
+  const driverLoader = useResource(DatabaseAuthDialog, DBDriverResource, connectionInfoLoader.data?.driverId || null);
+  const useSharedCredentials = (connectionInfoLoader.data?.sharedSecrets?.length || 0) > 1;
 
-  const { credentialsSavingEnabled } = useAdministrationSettings();
-  const dialog = useDatabaseAuthDialog(payload.connection, payload.networkHandlers, payload.resetCredentials, resolveDialog);
-  const errorDetails = useErrorDetails(dialog.authException);
+  let subtitle = connectionInfoLoader.data?.name;
 
-  useAutoLoad(DatabaseAuthDialog, dialog);
+  if (useSharedCredentials) {
+    subtitle = [subtitle, translate('plugin_connections_connection_auth_secret_description')].join(' | ');
+  }
 
   return (
-    <CommonDialogWrapper size="large">
+    <CommonDialogWrapper size="large" fixedSize={useSharedCredentials}>
       <CommonDialogHeader
         title="connections_database_authentication"
-        subTitle={dialog.connection?.name}
-        icon={dialog.driver?.icon}
+        subTitle={subtitle}
+        icon={driverLoader.data?.icon}
         onReject={options?.persistent ? undefined : rejectDialog}
       />
-      <CommonDialogBody>
-        <Form ref={focusedRef} className={s(styles, { submittingForm: true })} onSubmit={dialog.login}>
-          <Loader state={dialog} inlineException>
-            <ConnectionAuthenticationFormLoader
-              config={dialog.config}
-              authModelId={dialog.authModelId}
-              authProperties={dialog.connection?.authProperties}
-              networkHandlers={payload.networkHandlers}
-              formId={`${payload.connection.projectId}:${payload.connection.connectionId}`}
-              allowSaveCredentials={credentialsSavingEnabled}
-              className={s(styles, { connectionAuthenticationFormLoader: true })}
-              disabled={dialog.authenticating}
-              hideFeatures={['nonSecuredProperty']}
-            />
-          </Loader>
-        </Form>
-      </CommonDialogBody>
-      <CommonDialogFooter>
-        <DBAuthDialogFooter isAuthenticating={dialog.authenticating} onLogin={dialog.login}>
-          {dialog.authException && (
-            <ErrorMessage
-              text={errorDetails.message ?? translate('core_blocks_exception_message_error_message')}
-              hasDetails={errorDetails.hasDetails}
-              className={style.errorMessage}
-              onShowDetails={errorDetails.open}
-            />
-          )}
-        </DBAuthDialogFooter>
-      </CommonDialogFooter>
+      {useSharedCredentials ? (
+        <DatabaseSecretAuthDialog connectionKey={payload.connection} onLogin={resolveDialog} />
+      ) : (
+        <DatabaseCredentialsAuthDialog
+          connection={payload.connection}
+          networkHandlers={payload.networkHandlers}
+          resetCredentials={payload.resetCredentials}
+          onLogin={resolveDialog}
+        />
+      )}
     </CommonDialogWrapper>
   );
 });
diff --git a/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseAuthDialog.m.css b/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseCredentialsAuthDialog/DatabaseCredentialsAuthDialog.m.css
similarity index 100%
rename from webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseAuthDialog.m.css
rename to webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseCredentialsAuthDialog/DatabaseCredentialsAuthDialog.m.css
diff --git a/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseCredentialsAuthDialog/DatabaseCredentialsAuthDialog.tsx b/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseCredentialsAuthDialog/DatabaseCredentialsAuthDialog.tsx
new file mode 100644
index 0000000000..2aebbf2f87
--- /dev/null
+++ b/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseCredentialsAuthDialog/DatabaseCredentialsAuthDialog.tsx
@@ -0,0 +1,87 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { observer } from 'mobx-react-lite';
+
+import {
+  CommonDialogBody,
+  CommonDialogFooter,
+  ErrorMessage,
+  Form,
+  Loader,
+  s,
+  useAdministrationSettings,
+  useAutoLoad,
+  useErrorDetails,
+  useFocus,
+  useS,
+  useTranslate,
+} from '@cloudbeaver/core-blocks';
+import type { IConnectionInfoParams } from '@cloudbeaver/core-connections';
+
+import { ConnectionAuthenticationFormLoader } from '../../ConnectionAuthentication/ConnectionAuthenticationFormLoader';
+import style from './DatabaseCredentialsAuthDialog.m.css';
+import { DatabaseCredentialsAuthDialogFooter } from './DatabaseCredentialsAuthDialogFooter';
+import { useDatabaseCredentialsAuthDialog } from './useDatabaseCredentialsAuthDialog';
+
+interface Props {
+  connection: IConnectionInfoParams;
+  networkHandlers: string[];
+  resetCredentials?: boolean;
+  onLogin?: () => void;
+}
+
+export const DatabaseCredentialsAuthDialog = observer<Props>(function DatabaseCredentialsAuthDialog({
+  connection,
+  networkHandlers,
+  resetCredentials,
+  onLogin,
+}) {
+  const styles = useS(style);
+  const translate = useTranslate();
+  const [focusedRef] = useFocus<HTMLFormElement>({ focusFirstChild: true });
+
+  const { credentialsSavingEnabled } = useAdministrationSettings();
+  const dialog = useDatabaseCredentialsAuthDialog(connection, networkHandlers, resetCredentials, onLogin);
+  const errorDetails = useErrorDetails(dialog.authException);
+
+  useAutoLoad(DatabaseCredentialsAuthDialog, dialog);
+
+  return (
+    <>
+      <CommonDialogBody>
+        <Form ref={focusedRef} className={s(styles, { submittingForm: true })} onSubmit={dialog.login}>
+          <Loader state={dialog} inlineException>
+            <ConnectionAuthenticationFormLoader
+              config={dialog.config}
+              authModelId={dialog.authModelId}
+              authProperties={dialog.connection?.authProperties}
+              networkHandlers={networkHandlers}
+              formId={`${connection.projectId}:${connection.connectionId}`}
+              allowSaveCredentials={credentialsSavingEnabled}
+              className={s(styles, { connectionAuthenticationFormLoader: true })}
+              disabled={dialog.authenticating}
+              hideFeatures={['nonSecuredProperty']}
+            />
+          </Loader>
+        </Form>
+      </CommonDialogBody>
+      <CommonDialogFooter>
+        <DatabaseCredentialsAuthDialogFooter isAuthenticating={dialog.authenticating} onLogin={dialog.login}>
+          {dialog.authException && (
+            <ErrorMessage
+              text={errorDetails.message ?? translate('core_blocks_exception_message_error_message')}
+              hasDetails={errorDetails.hasDetails}
+              className={style.errorMessage}
+              onShowDetails={errorDetails.open}
+            />
+          )}
+        </DatabaseCredentialsAuthDialogFooter>
+      </CommonDialogFooter>
+    </>
+  );
+});
diff --git a/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DBAuthDialogFooter.tsx b/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseCredentialsAuthDialog/DatabaseCredentialsAuthDialogFooter.tsx
similarity index 89%
rename from webapp/packages/plugin-connections/src/DatabaseAuthDialog/DBAuthDialogFooter.tsx
rename to webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseCredentialsAuthDialog/DatabaseCredentialsAuthDialogFooter.tsx
index 67dc57ac5d..79b537bf54 100644
--- a/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DBAuthDialogFooter.tsx
+++ b/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseCredentialsAuthDialog/DatabaseCredentialsAuthDialogFooter.tsx
@@ -32,7 +32,7 @@ export interface Props {
   className?: string;
 }
 
-export const DBAuthDialogFooter = observer<React.PropsWithChildren<Props>>(function DBAuthDialogFooter({
+export const DatabaseCredentialsAuthDialogFooter = observer<React.PropsWithChildren<Props>>(function DatabaseCredentialsAuthDialogFooter({
   isAuthenticating,
   onLogin,
   className,
diff --git a/webapp/packages/plugin-connections/src/DatabaseAuthDialog/useDatabaseAuthDialog.ts b/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseCredentialsAuthDialog/useDatabaseCredentialsAuthDialog.ts
similarity index 94%
rename from webapp/packages/plugin-connections/src/DatabaseAuthDialog/useDatabaseAuthDialog.ts
rename to webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseCredentialsAuthDialog/useDatabaseCredentialsAuthDialog.ts
index fdb55bcb03..06c9378c10 100644
--- a/webapp/packages/plugin-connections/src/DatabaseAuthDialog/useDatabaseAuthDialog.ts
+++ b/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseCredentialsAuthDialog/useDatabaseCredentialsAuthDialog.ts
@@ -21,7 +21,7 @@ import { useService } from '@cloudbeaver/core-di';
 import { NetworkHandlerAuthType } from '@cloudbeaver/core-sdk';
 import type { ILoadableState } from '@cloudbeaver/core-utils';
 
-import type { IConnectionAuthenticationConfig } from '../ConnectionAuthentication/IConnectionAuthenticationConfig';
+import type { IConnectionAuthenticationConfig } from '../../ConnectionAuthentication/IConnectionAuthenticationConfig';
 
 interface IState extends ILoadableState {
   readonly authModelId: string | null;
@@ -38,7 +38,12 @@ interface IState extends ILoadableState {
   getConfig: () => ConnectionInitConfig;
 }
 
-export function useDatabaseAuthDialog(key: IConnectionInfoParams, networkHandlers: string[], resetCredentials?: boolean, onInit?: () => void) {
+export function useDatabaseCredentialsAuthDialog(
+  key: IConnectionInfoParams,
+  networkHandlers: string[],
+  resetCredentials?: boolean,
+  onInit?: () => void,
+) {
   const connectionInfoResource = useService(ConnectionInfoResource);
   const dbDriverResource = useService(DBDriverResource);
 
diff --git a/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseSecretAuthDialog/DatabaseSecretAuthDialog.tsx b/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseSecretAuthDialog/DatabaseSecretAuthDialog.tsx
new file mode 100644
index 0000000000..c5c09f4125
--- /dev/null
+++ b/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseSecretAuthDialog/DatabaseSecretAuthDialog.tsx
@@ -0,0 +1,88 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { observable } from 'mobx';
+import { observer } from 'mobx-react-lite';
+
+import {
+  CommonDialogBody,
+  CommonDialogFooter,
+  ExceptionMessage,
+  Group,
+  ItemList,
+  ListItem,
+  ListItemName,
+  Loader,
+  useObservableRef,
+  useResource,
+} from '@cloudbeaver/core-blocks';
+import { ConnectionInfoResource, type IConnectionInfoParams } from '@cloudbeaver/core-connections';
+
+interface Props {
+  connectionKey: IConnectionInfoParams;
+  onLogin?: () => void;
+}
+
+export const DatabaseSecretAuthDialog = observer<Props>(function DatabaseSecretAuthDialog({ connectionKey, onLogin }) {
+  const connectionInfoLoader = useResource(DatabaseSecretAuthDialog, ConnectionInfoResource, {
+    key: connectionKey,
+    includes: ['includeAuthNeeded', 'includeSharedSecrets', 'includeNetworkHandlersConfig', 'includeCredentialsSaved'],
+  });
+  const state = useObservableRef(
+    () => ({
+      exception: null as Error | null,
+      authenticating: false,
+    }),
+    {
+      exception: observable.ref,
+      authenticating: observable.ref,
+    },
+    false,
+  );
+  const secrets = connectionInfoLoader.data?.sharedSecrets || [];
+
+  async function handleSecretSelect(secretId: string) {
+    try {
+      state.authenticating = true;
+      await connectionInfoLoader.resource.init({
+        ...connectionKey,
+        selectedSecretId: secretId,
+      });
+      state.exception = null;
+      onLogin?.();
+    } catch (exception: any) {
+      state.exception = exception;
+    } finally {
+      state.authenticating = false;
+    }
+  }
+
+  if (state.authenticating) {
+    return <Loader loader />;
+  }
+
+  return (
+    <>
+      <CommonDialogBody noBodyPadding>
+        <ItemList>
+          {secrets.map(secret => (
+            <ListItem key={secret.secretId} onClick={() => handleSecretSelect(secret.secretId)}>
+              <ListItemName>{secret.displayName}</ListItemName>
+            </ListItem>
+          ))}
+        </ItemList>
+      </CommonDialogBody>
+      {state.exception && (
+        <CommonDialogFooter>
+          <Group secondary vertical dense>
+            <ExceptionMessage exception={state.exception} inline />
+          </Group>
+        </CommonDialogFooter>
+      )}
+    </>
+  );
+});
diff --git a/webapp/packages/plugin-connections/src/PublicConnectionForm/PublicConnectionFormService.ts b/webapp/packages/plugin-connections/src/PublicConnectionForm/PublicConnectionFormService.ts
index a0b4ace7f8..272bf0747f 100644
--- a/webapp/packages/plugin-connections/src/PublicConnectionForm/PublicConnectionFormService.ts
+++ b/webapp/packages/plugin-connections/src/PublicConnectionForm/PublicConnectionFormService.ts
@@ -8,8 +8,8 @@
 import { action, makeObservable, observable } from 'mobx';
 
 import { UserInfoResource } from '@cloudbeaver/core-authentication';
-import { ConfirmationDialog } from '@cloudbeaver/core-blocks';
-import { ConnectionInfoResource, createConnectionParam, IConnectionInfoParams } from '@cloudbeaver/core-connections';
+import { ConfirmationDialog, importLazyComponent } from '@cloudbeaver/core-blocks';
+import { ConnectionInfoResource, ConnectionsManagerService, createConnectionParam, IConnectionInfoParams } from '@cloudbeaver/core-connections';
 import { injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService, DialogueStateResult } from '@cloudbeaver/core-dialogs';
 import { NotificationService } from '@cloudbeaver/core-events';
@@ -20,11 +20,11 @@ import type { ConnectionConfig } from '@cloudbeaver/core-sdk';
 import { OptionsPanelService } from '@cloudbeaver/core-ui';
 import { AuthenticationService } from '@cloudbeaver/plugin-authentication';
 
-import { ConnectionAuthService } from '../ConnectionAuthService';
 import { ConnectionFormService } from '../ConnectionForm/ConnectionFormService';
 import { ConnectionFormState } from '../ConnectionForm/ConnectionFormState';
 import type { IConnectionFormState } from '../ConnectionForm/IConnectionFormProps';
-import { PublicConnectionForm } from './PublicConnectionForm';
+
+const PublicConnectionForm = importLazyComponent(() => import('./PublicConnectionForm').then(m => m.PublicConnectionForm));
 
 const formGetter = () => PublicConnectionForm;
 
@@ -38,7 +38,7 @@ export class PublicConnectionFormService {
     private readonly optionsPanelService: OptionsPanelService,
     private readonly connectionFormService: ConnectionFormService,
     private readonly connectionInfoResource: ConnectionInfoResource,
-    private readonly connectionAuthService: ConnectionAuthService,
+    private readonly connectionsManagerService: ConnectionsManagerService,
     private readonly userInfoResource: UserInfoResource,
     private readonly authenticationService: AuthenticationService,
     private readonly projectsService: ProjectsService,
@@ -203,7 +203,7 @@ export class PublicConnectionFormService {
 
     try {
       await this.connectionInfoResource.close(connectionKey);
-      await this.connectionAuthService.auth(connectionKey);
+      await this.connectionsManagerService.requireConnection(connectionKey);
     } catch (exception: any) {
       this.notificationService.logException(exception, 'connections_public_connection_edit_reconnect_failed');
     }
diff --git a/webapp/packages/plugin-connections/src/index.ts b/webapp/packages/plugin-connections/src/index.ts
index f2e9d6b180..9d5de586c7 100644
--- a/webapp/packages/plugin-connections/src/index.ts
+++ b/webapp/packages/plugin-connections/src/index.ts
@@ -7,6 +7,7 @@ export * from './ConnectionForm/DriverProperties/ConnectionDriverPropertiesTabSe
 export * from './ConnectionForm/SSH/ConnectionSSHTabService';
 export * from './ConnectionForm/OriginInfo/ConnectionOriginInfoTabService';
 export * from './ConnectionForm/Contexts/connectionConfigContext';
+export * from './ConnectionForm/Contexts/connectionCredentialsStateContext';
 export * from './ConnectionForm/ConnectionFormBaseActionsLoader';
 export * from './ConnectionForm/connectionFormConfigureContext';
 export * from './ConnectionForm/ConnectionFormLoader';
@@ -14,6 +15,8 @@ export * from './ConnectionForm/ConnectionFormService';
 export * from './ConnectionForm/ConnectionFormState';
 export * from './ConnectionForm/IConnectionFormProps';
 export * from './ConnectionForm/useConnectionFormState';
+export * from './ConnectionForm/SharedCredentials/CONNECTION_FORM_SHARED_CREDENTIALS_TAB_ID';
+export * from './ConnectionForm/ConnectionAuthModelCredentials/ConnectionAuthModelCredentialsForm';
 export * from './ContextMenu/MENU_CONNECTION_VIEW';
 export * from './ContextMenu/MENU_CONNECTIONS';
 export * from './PublicConnectionForm/PublicConnectionFormService';
diff --git a/webapp/packages/plugin-connections/src/locales/en.ts b/webapp/packages/plugin-connections/src/locales/en.ts
index 98b3b99594..6c87ad975f 100644
--- a/webapp/packages/plugin-connections/src/locales/en.ts
+++ b/webapp/packages/plugin-connections/src/locales/en.ts
@@ -20,4 +20,8 @@ export default [
   ['settings_connections_hide_connections_view_description', 'Show connections to admins only'],
 
   ['connections_public_connection_ssl_enable', 'Enable SSL'],
+
+  ['plugin_connections_connection_form_shared_credentials_manage_info', 'You can manage credentials in the '],
+  ['plugin_connections_connection_form_shared_credentials_manage_info_tab_link', 'Credentials tab'],
+  ['plugin_connections_connection_auth_secret_description', 'Please select credentials provided by one of your teams'],
 ];
diff --git a/webapp/packages/plugin-connections/src/locales/it.ts b/webapp/packages/plugin-connections/src/locales/it.ts
index c13c7bda6c..f95e5aceee 100644
--- a/webapp/packages/plugin-connections/src/locales/it.ts
+++ b/webapp/packages/plugin-connections/src/locales/it.ts
@@ -22,4 +22,8 @@ export default [
   ['settings_connections_hide_connections_view_description', 'Show connections to admins only'],
 
   ['connections_public_connection_ssl_enable', 'Enable SSL'],
+
+  ['plugin_connections_connection_form_shared_credentials_manage_info', 'You can manage credentials in the '],
+  ['plugin_connections_connection_form_shared_credentials_manage_info_tab_link', 'Credentials tab'],
+  ['plugin_connections_connection_auth_secret_description', 'Please select credentials provided by one of your teams'],
 ];
diff --git a/webapp/packages/plugin-connections/src/locales/ru.ts b/webapp/packages/plugin-connections/src/locales/ru.ts
index 711186564a..9ba585075f 100644
--- a/webapp/packages/plugin-connections/src/locales/ru.ts
+++ b/webapp/packages/plugin-connections/src/locales/ru.ts
@@ -19,4 +19,8 @@ export default [
   ['settings_connections_hide_connections_view_description', 'Показывать подключения только администраторам'],
 
   ['connections_public_connection_ssl_enable', 'Включить SSL'],
+
+  ['plugin_connections_connection_form_shared_credentials_manage_info', 'Вы можете указать учетные данные в '],
+  ['plugin_connections_connection_form_shared_credentials_manage_info_tab_link', 'во вкладке "Учетные данные"'],
+  ['plugin_connections_connection_auth_secret_description', 'Выберете учетные данные, предоставленные одной из ваших команд'],
 ];
diff --git a/webapp/packages/plugin-connections/src/locales/zh.ts b/webapp/packages/plugin-connections/src/locales/zh.ts
index e8c876924c..ef31d2598f 100644
--- a/webapp/packages/plugin-connections/src/locales/zh.ts
+++ b/webapp/packages/plugin-connections/src/locales/zh.ts
@@ -19,4 +19,8 @@ export default [
   ['settings_connections_hide_connections_view_description', 'Show connections to admins only'],
 
   ['connections_public_connection_ssl_enable', 'Enable SSL'],
+
+  ['plugin_connections_connection_form_shared_credentials_manage_info', 'You can manage credentials in the '],
+  ['plugin_connections_connection_form_shared_credentials_manage_info_tab_link', 'Credentials tab'],
+  ['plugin_connections_connection_auth_secret_description', 'Please select credentials provided by one of your teams'],
 ];
diff --git a/webapp/packages/plugin-connections/src/manifest.ts b/webapp/packages/plugin-connections/src/manifest.ts
index 4afa470555..ccdfe2fe77 100644
--- a/webapp/packages/plugin-connections/src/manifest.ts
+++ b/webapp/packages/plugin-connections/src/manifest.ts
@@ -13,13 +13,13 @@ import { ConnectionDriverPropertiesTabService } from './ConnectionForm/DriverPro
 import { ConnectionOptionsTabService } from './ConnectionForm/Options/ConnectionOptionsTabService';
 import { ConnectionOriginInfoTabService } from './ConnectionForm/OriginInfo/ConnectionOriginInfoTabService';
 import { ConnectionSSHTabService } from './ConnectionForm/SSH/ConnectionSSHTabService';
+import { ConnectionSSLTabService } from './ConnectionForm/SSL/ConnectionSSLTabService';
 import { ConnectionMenuBootstrap } from './ContextMenu/ConnectionMenuBootstrap';
 import { LocaleService } from './LocaleService';
 import { ConnectionFoldersBootstrap } from './NavNodes/ConnectionFoldersBootstrap';
 import { PluginBootstrap } from './PluginBootstrap';
 import { PluginConnectionsSettingsService } from './PluginConnectionsSettingsService';
 import { PublicConnectionFormService } from './PublicConnectionForm/PublicConnectionFormService';
-import { ConnectionSSLTabService } from './ConnectionForm/SSL/ConnectionSSLTabService';
 
 export const connectionPlugin: PluginManifest = {
   info: {
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/FilterCustomValueDialog.tsx b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/FilterCustomValueDialog.tsx
index a8fa44907b..30bae2860f 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/FilterCustomValueDialog.tsx
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/FilterCustomValueDialog.tsx
@@ -27,7 +27,7 @@ import style from './FilterCustomValueDialog.m.css';
 
 interface IPayload {
   inputTitle: string;
-  defaultValue: string | number;
+  defaultValue: string;
 }
 
 export const FilterCustomValueDialog: DialogComponent<IPayload, string | number> = observer(function FilterCustomValueDialog({
@@ -39,7 +39,7 @@ export const FilterCustomValueDialog: DialogComponent<IPayload, string | number>
   const styles = useS(style);
   const inputRef = useRef<HTMLInputElement | null>(null);
 
-  const [value, setValue] = useState<string | number>(payload.defaultValue);
+  const [value, setValue] = useState(payload.defaultValue);
   const handleApply = useCallback(() => resolveDialog(value), [value, resolveDialog]);
   const translate = useTranslate();
 
diff --git a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/NavigationTabsBar.tsx b/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/NavigationTabsBar.tsx
index cb7f4ecb62..dd4d045432 100644
--- a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/NavigationTabsBar.tsx
+++ b/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/NavigationTabsBar.tsx
@@ -6,11 +6,11 @@
  * you may not use this file except in compliance with the License.
  */
 import { observer } from 'mobx-react-lite';
-import { useCallback, useEffect } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 import styled, { css } from 'reshadow';
 
 import { UserInfoResource } from '@cloudbeaver/core-authentication';
-import { TextPlaceholder, useExecutor, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
+import { Loader, TextPlaceholder, useExecutor, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { BASE_TAB_STYLES, ITabData, TabPanel, TabsBox } from '@cloudbeaver/core-ui';
 import { CaptureView } from '@cloudbeaver/core-view';
@@ -47,6 +47,7 @@ export const NavigationTabsBar = observer<Props>(function NavigationTabsBar({ cl
   // TODO: we get exception when after closing the restored page trying to open another
   //       it's related to hooks order and state restoration
   const style = useStyles(BASE_TAB_STYLES, styles);
+  const [restoring, setRestoring] = useState(false);
   const translate = useTranslate();
 
   const handleSelect = useCallback((tabId: string) => navigation.selectTab(tabId), [navigation]);
@@ -57,7 +58,12 @@ export const NavigationTabsBar = observer<Props>(function NavigationTabsBar({ cl
   }
 
   async function restoreTabs() {
-    await navigation.restoreTabs();
+    setRestoring(true);
+    try {
+      await navigation.restoreTabs();
+    } finally {
+      setRestoring(false);
+    }
   }
 
   function handleTabChange(tab: ITabData<any>) {
@@ -85,24 +91,26 @@ export const NavigationTabsBar = observer<Props>(function NavigationTabsBar({ cl
 
   return styled(style)(
     <CaptureView view={navigation} className={className}>
-      <TabsBox
-        currentTabId={navigation.currentTabId}
-        tabs={navigation.tabIdList.map(tabId => (
-          <TabHandlerTab key={tabId} tabId={tabId} style={styles} onSelect={handleSelect} onClose={handleClose} />
-        ))}
-        tabList={navigation.tabIdList}
-        style={styles}
-        tabIndex={0}
-        autoSelect
-        enabledBaseActions
-        onChange={handleTabChange}
-      >
-        {navigation.tabIdList.map(tabId => (
-          <TabPanel key={tabId} tabId={tabId} lazy>
-            {() => <TabHandlerPanel tabId={tabId} />}
-          </TabPanel>
-        ))}
-      </TabsBox>
+      <Loader loading={restoring}>
+        <TabsBox
+          currentTabId={navigation.currentTabId}
+          tabs={navigation.tabIdList.map(tabId => (
+            <TabHandlerTab key={tabId} tabId={tabId} style={styles} onSelect={handleSelect} onClose={handleClose} />
+          ))}
+          tabList={navigation.tabIdList}
+          style={styles}
+          tabIndex={0}
+          autoSelect
+          enabledBaseActions
+          onChange={handleTabChange}
+        >
+          {navigation.tabIdList.map(tabId => (
+            <TabPanel key={tabId} tabId={tabId} lazy>
+              {() => <TabHandlerPanel tabId={tabId} />}
+            </TabPanel>
+          ))}
+        </TabsBox>
+      </Loader>
     </CaptureView>,
   );
 });
diff --git a/webapp/packages/plugin-resource-manager-scripts/src/PluginBootstrap.ts b/webapp/packages/plugin-resource-manager-scripts/src/PluginBootstrap.ts
index 38c60dd002..bad5d7c8e4 100644
--- a/webapp/packages/plugin-resource-manager-scripts/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-resource-manager-scripts/src/PluginBootstrap.ts
@@ -5,6 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
+import { importLazyComponent } from '@cloudbeaver/core-blocks';
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { getCachedDataResourceLoaderState } from '@cloudbeaver/core-resource';
 import { ServerConfigResource } from '@cloudbeaver/core-root';
@@ -13,9 +14,10 @@ import { ActionService, DATA_CONTEXT_MENU, menuExtractItems, MenuService } from
 import { MENU_TOOLS } from '@cloudbeaver/plugin-tools-panel';
 
 import { ACTION_RESOURCE_MANAGER_SCRIPTS } from './Actions/ACTION_RESOURCE_MANAGER_SCRIPTS';
-import { ResourceManagerScripts } from './ResourceManagerScripts';
 import { ResourceManagerScriptsService } from './ResourceManagerScriptsService';
 
+const ResourceManagerScripts = importLazyComponent(() => import('./ResourceManagerScripts').then(m => m.ResourceManagerScripts));
+
 @injectable()
 export class PluginBootstrap extends Bootstrap {
   constructor(
@@ -57,9 +59,12 @@ export class PluginBootstrap extends Bootstrap {
       isActionApplicable: (context, action) => [ACTION_RESOURCE_MANAGER_SCRIPTS].includes(action),
       isHidden: () => !this.resourceManagerScriptsService.enabled,
       isChecked: () => this.resourceManagerScriptsService.active,
-      getLoader: (context, action) => {
-        return getCachedDataResourceLoaderState(this.serverConfigResource, undefined, undefined);
-      },
+      getLoader: () =>
+        getCachedDataResourceLoaderState(
+          this.serverConfigResource,
+          () => undefined,
+          () => undefined,
+        ),
       handler: (context, action) => {
         switch (action) {
           case ACTION_RESOURCE_MANAGER_SCRIPTS: {
diff --git a/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/ChangePassword/ChangePassword.tsx b/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/ChangePassword/ChangePassword.tsx
index a65d27163e..590fd2cbd3 100644
--- a/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/ChangePassword/ChangePassword.tsx
+++ b/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/ChangePassword/ChangePassword.tsx
@@ -23,7 +23,15 @@ export const ChangePassword = observer(function ChangePassword() {
     <Form context={form}>
       <Group form gap>
         <GroupTitle>{translate('plugin_user_profile_authentication_change_password')}</GroupTitle>
-        <InputField type="password" name="oldPassword" state={state.config} disabled={disabled} mapValue={value => value.trim()} small required>
+        <InputField
+          type="password"
+          name="oldPassword"
+          state={state.config}
+          disabled={disabled}
+          mapValue={(value?: string) => value?.trim() ?? ''}
+          small
+          required
+        >
           {translate('plugin_user_profile_authentication_change_password_current_password')}
         </InputField>
         <InputField
@@ -32,17 +40,31 @@ export const ChangePassword = observer(function ChangePassword() {
           autoComplete="new-password"
           state={state.config}
           disabled={disabled}
-          mapValue={value => value.trim()}
+          mapValue={(value?: string) => value?.trim() ?? ''}
           small
           required
         >
           {translate('plugin_user_profile_authentication_change_password_new_password')}
         </InputField>
-        <InputField type="password" name="repeatedPassword" state={state.config} disabled={disabled} mapValue={value => value.trim()} small required>
+        <InputField
+          type="password"
+          name="repeatedPassword"
+          state={state.config}
+          disabled={disabled}
+          mapValue={(value?: string) => value?.trim() ?? ''}
+          small
+          required
+        >
           {translate('plugin_user_profile_authentication_change_password_repeat_password')}
         </InputField>
         <GroupItem>
-          <Button disabled={disabled || !state.formFilled} loading={state.submitting} type="button" mod={['unelevated']} onClick={() => form.submit()}>
+          <Button
+            disabled={disabled || !state.formFilled}
+            loading={state.submitting}
+            type="button"
+            mod={['unelevated']}
+            onClick={() => form.submit()}
+          >
             {translate('plugin_user_profile_authentication_change_password_submit_label')}
           </Button>
         </GroupItem>