From 0d41713c2d841b6dcb8a3bb972530607ecd70b9e Mon Sep 17 00:00:00 2001
From: Alexey <wrouds@gmail.com>
Date: Thu, 28 Sep 2023 15:28:28 +0200
Subject: [PATCH] CB-3456 refactor: user form (#2010)

* CB-3456 chore: cleanup users administration

* CB-3456 chore: add label for user credentials column

* CB-3456 chore: add deprecation message to reshadow system

* CB-3456 chore: add deprecation message to ComponentStyle

* CB-3456 refactor: user form

* CB-3456 fix: eslint problems

* CB-3456 fix: after review

* CB-3456 fix: base form localization

* CB-3456 fix: remove unused import

* CB-3456 fix: user default team assignment

* CB-3456 chore: update git indexes

* CB-3456 fix: imports

* CB-3456 fix: enable user by default

* CB-3456 refactor: implement FormPart

* CB-3456 fix: make sh executable

* CB-3456 fix: make sh executable

* CB-3456 fix: handle form part exceptions on save

---------

Co-authored-by: EvgeniaBzzz <139753579+EvgeniaBzzz@users.noreply.github.com>
---
 .vscode/tasks.json                            |   7 +-
 deploy/build-sqlite.sh                        |   0
 .../schema/service.core.graphqls              |   1 +
 .../io/cloudbeaver/model/WebServerConfig.java |   5 +
 .../core-authentication/src/UsersResource.ts  |  29 +-
 .../core-blocks/src/Containers/Group.m.css    |   4 +
 .../core-blocks/src/FormControls/Form.tsx     |  67 +++
 .../src/FormControls/FormContext.ts           |  13 +-
 .../src/FormControls/InputField.tsx           |  10 +-
 .../src/FormControls/SubmittingForm.tsx       | 101 -----
 .../FormControls/useCustomInputValidation.ts  |  63 +++
 .../core-blocks/src/FormControls/useForm.ts   | 145 +++++++
 .../core-blocks/src/Loader/useAutoLoad.ts     |  46 ++-
 .../src/ResourcesHooks/useResource.ts         |  14 +-
 .../core-blocks/src/StaticImage.m.css         |  10 +
 .../packages/core-blocks/src/StaticImage.tsx  |  11 +-
 .../core-blocks/src/StatusMessage.tsx         |   8 +-
 .../packages/core-blocks/src/Table/Table.tsx  |   6 +-
 .../core-blocks/src/Table/TableItem.tsx       |  23 +-
 .../core-blocks/src/Table/TableItemSelect.tsx |  29 +-
 .../core-blocks/src/Table/TableState.ts       |  16 +-
 webapp/packages/core-blocks/src/index.ts      |   6 +-
 .../core-blocks/src/useCombinedRef.ts         |   4 +-
 .../packages/core-blocks/src/useExecutor.ts   |  24 +-
 webapp/packages/core-blocks/src/useFocus.ts   |  13 +-
 webapp/packages/core-blocks/src/useS.ts       |   2 +-
 webapp/packages/core-blocks/src/useStyles.ts  |   1 +
 webapp/packages/core-cli/global.d.ts          |  20 +
 webapp/packages/core-di/src/Bootstrap.ts      |   4 +-
 .../src/CommonDialog/RenameDialog.tsx         |   6 +-
 .../src/ExecutorHandlersCollection.ts         |   8 +
 .../src/IExecutorHandlersCollection.ts        |   2 +
 .../src/Resource/CachedDataResource.ts        |  14 +-
 .../src/Resource/CachedMapResource.ts         |  20 +-
 .../src/Resource/CachedTreeResource.ts        |   8 +-
 .../src/queries/session/serverConfig.gql      |   1 +
 .../core-theming/src/ComponentStyle.ts        |   3 +
 .../src/Form/DATA_CONTEXT_FORM_STATE.ts       |  12 +
 .../core-ui/src/Form/FormBaseService.ts       |  87 ++++
 .../src/Form/FormMode.ts}                     |   9 +-
 webapp/packages/core-ui/src/Form/FormPart.ts  | 140 +++++++
 webapp/packages/core-ui/src/Form/FormState.ts | 223 ++++++++++
 webapp/packages/core-ui/src/Form/IFormPart.ts |  18 +
 .../packages/core-ui/src/Form/IFormProps.ts   |  12 +
 .../packages/core-ui/src/Form/IFormState.ts   |  53 +++
 .../core-ui/src/Form/IFormStateInfo.ts        |  16 +
 .../core-ui/src/Form/formStateContext.ts      |  55 +++
 .../core-ui/src/Form/formStatusContext.ts     |  31 ++
 .../core-ui/src/Form/formValidationContext.ts |  28 ++
 .../Tabs/DATA_CONTEXT_TABS_FORM_VALIDATION.ts |  10 +
 .../core-ui/src/Tabs/Tab/TabDefault.tsx       |   8 +-
 .../packages/core-ui/src/Tabs/Tab/TabProps.ts |   1 +
 .../packages/core-ui/src/Tabs/Tab/useTab.ts   |  12 +-
 webapp/packages/core-ui/src/Tabs/TabList.tsx  |   8 +-
 webapp/packages/core-ui/src/Tabs/TabPanel.tsx |  41 +-
 .../src/Tabs/TabsContainer/ITabsContainer.ts  |   7 +-
 .../src/Tabs/TabsContainer/TabsContainer.ts   |  28 +-
 .../packages/core-ui/src/Tabs/TabsContext.ts  |   2 +
 .../packages/core-ui/src/Tabs/TabsState.tsx   |  35 +-
 webapp/packages/core-ui/src/index.ts          |  13 +
 webapp/packages/core-ui/src/locales/en.ts     |   5 +-
 webapp/packages/core-ui/src/locales/it.ts     |   5 +-
 webapp/packages/core-ui/src/locales/ru.ts     |   5 +-
 .../packages/core-utils/src/ILoadableState.ts |  13 +-
 .../src/Action/Actions/ACTION_CREATE.ts       |  12 +
 .../DataContext/DATA_CONTEXT_DI_PROVIDER.ts   |  12 +
 .../core-view/src/DataContext/DataContext.ts  |   5 +-
 .../src/DataContext/DataContextGetter.ts      |   3 +-
 .../src/DataContext/TempDataContext.ts        |   3 +-
 .../src/DataContext/createDataContext.ts      |  10 +-
 .../DataContext/dataContextAddDIProvider.ts   |  16 +
 .../DATA_CONTEXT_LOADABLE_STATE.ts            |  12 +-
 .../core-view/src/Menu/useMenuContext.ts      |   2 +-
 webapp/packages/core-view/src/index.ts        |   3 +
 webapp/packages/core-view/src/locales/en.ts   |   1 +
 webapp/packages/core-view/src/locales/it.ts   |   1 +
 webapp/packages/core-view/src/locales/ru.ts   |   1 +
 .../packages/eslint-config/eslint-config.json |   2 +-
 .../ServerConfigurationPage.tsx               |   8 +-
 .../useConfigurationsTable.tsx                |   2 +-
 .../Options/AuthConfigurationOptions.tsx      |   8 +-
 .../AuthenticationProviders.tsx               |   2 +-
 .../ADMINISTRATION_ITEM_USER_CREATE_PARAM.ts  |   9 +
 .../MetaParameters/CreateMetaParameter.tsx    |  62 ---
 .../CreateMetaParameterService.ts             |  56 ---
 .../MetaParameters/Form/MetaParameterForm.tsx | 131 ------
 .../Form/UserInfo/MetaParameterInfoForm.tsx   |  35 --
 .../Form/UserInfo/MetaParameterInfoPanel.tsx  |  32 --
 .../Form/UserInfo/MetaParameterInfoTab.tsx    |  28 --
 .../Form/UserInfo/MetaParametersForm.tsx      |  48 ---
 .../Form/UserProfileFormState.ts              |  25 --
 .../MetaParameters/MetaParameterEdit.tsx      |  43 --
 .../MetaParameterEditController.ts            |  65 ---
 .../Users/MetaParameters/MetaParameters.tsx   | 137 -------
 .../MetaParametersController.ts               | 124 ------
 .../Users/MetaParameters/MetadataParam.tsx    |  41 --
 .../MetaParameters/UserDetailsInfo/Origin.tsx |  44 --
 .../Users/Teams/Options/TeamOptions.tsx       |   8 +-
 .../Users/Teams/TeamsTable/useTeamsTable.tsx  |   2 +-
 .../UserForm/AdministrationUserForm.m.css     |  45 ++
 .../Users/UserForm/AdministrationUserForm.tsx |  96 +++++
 .../UserForm/AdministrationUserFormService.ts |  24 ++
 .../UserForm/AdministrationUserFormState.ts   |  17 +
 .../ConnectionAccess/ConnectionAccess.tsx     | 130 ------
 .../ConnectionAccessTabBootstrap.ts           |  42 --
 ...ONTEXT_USER_FORM_CONNECTION_ACCESS_PART.ts |  27 ++
 .../UserFormConnectionAccess.tsx              | 119 ++++++
 .../UserFormConnectionAccessPanel.tsx         |  41 ++
 .../UserFormConnectionAccessPart.ts           |  76 ++++
 .../UserFormConnectionAccessPartBootstrap.ts  |  45 ++
 .../UserFormConnectionTableItem.tsx           |  56 +++
 .../Info/DATA_CONTEXT_USER_FORM_INFO_PART.ts  |  23 ++
 .../Users/UserForm/Info/IUserFormInfoState.ts |  15 +
 .../Users/UserForm/Info/UserFormInfo.tsx      |  55 +++
 .../UserForm/Info/UserFormInfoCredentials.tsx |  85 ++++
 .../Info/UserFormInfoMetaParameters.tsx       |  36 ++
 .../Users/UserForm/Info/UserFormInfoPart.ts   | 188 +++++++++
 .../Info/UserFormInfoPartBootstrap.ts         |  38 ++
 .../UserForm/Info/UserFormInfoPartService.ts  |  19 +
 .../Users/UserForm/Info/UserFormInfoTeams.tsx |  52 +++
 .../UserFormOriginInfoPanel.tsx}              |  52 ++-
 .../UserForm/Origin/UserFormOriginInfoTab.tsx |  34 ++
 .../Origin/UserFormOriginPartBootstrap.ts     |  65 +++
 .../getUserFormOriginTabId.ts}                |   2 +-
 .../Users/UserForm/OriginInfoTab.tsx          |  33 --
 .../Users/UserForm/UserForm.tsx               | 135 ------
 .../Users/UserForm/UserFormBaseBootstrap.ts   |  47 +--
 .../Users/UserForm/UserFormController.ts      | 387 ------------------
 .../Users/UserForm/UserFormService.ts         |  38 --
 .../Users/UserForm/UserInfo.tsx               | 163 --------
 .../Users/UsersAdministration.m.css           |  29 ++
 .../Users/UsersAdministration.tsx             |  60 +--
 .../UsersAdministrationNavigationService.ts   |   4 +-
 .../Users/UsersAdministrationService.ts       |   8 +-
 .../Users/UsersTable/CreateUser.tsx           |  20 +-
 .../Users/UsersTable/CreateUserBootstrap.ts   |  78 ++++
 .../Users/UsersTable/CreateUserService.ts     |  21 +-
 .../UsersTable/UserCredentialsList.m.css      |  36 ++
 .../Origin.tsx => UserCredentialsList.tsx}    |  28 +-
 .../UsersTable/UserDetailsInfo/Origin.m.css   |  22 -
 .../Users/UsersTable/UserEdit.m.css           |  16 +
 .../Users/UsersTable/UserEdit.tsx             |  52 +--
 .../UsersAdministrationToolsPanel.tsx         |  23 +-
 .../Users/UsersTable/UsersPage.tsx            |   6 +-
 .../Users/UsersTable/UsersTable.tsx           |  16 +-
 .../Users/UsersTable/useUsersTable.tsx        |   2 +-
 .../src/index.ts                              |   5 +-
 .../src/manifest.ts                           |  20 +-
 .../src/Dialog/AuthDialog.tsx                 |  17 +-
 .../src/CustomConnectionPluginBootstrap.ts    |   6 +-
 .../src/Search/DatabaseList.tsx               |   8 +-
 .../src/SearchConnectionPluginBootstrap.ts    |   6 +-
 .../src/ConnectionDialog/ConnectionDialog.tsx |   6 +-
 .../src/TemplateConnectionPluginBootstrap.ts  |  12 +-
 .../ConnectionAccessTabService.ts             |   4 +-
 .../ConnectionAuthenticationDialog.tsx        |   6 +-
 .../src/ConnectionForm/ConnectionForm.tsx     |  20 +-
 .../src/ConnectionForm/ConnectionFormState.ts |   9 +-
 .../Contexts/connectionFormStateContext.ts    |  28 --
 .../ConnectionDriverPropertiesTabService.ts   |   4 +-
 .../ConnectionForm/IConnectionFormProps.ts    |   4 +-
 .../Options/ConnectionOptionsTabService.ts    |   8 +-
 .../src/ConnectionForm/Options/Options.tsx    |   8 +-
 .../SSH/ConnectionSSHTabService.ts            |   4 +-
 .../src/ConnectionForm/SSH/SSH.tsx            |   8 +-
 .../SSL/ConnectionSSLTabService.ts            |   4 +-
 .../src/ConnectionForm/SSL/SSL.tsx            |   8 +-
 .../ContextMenu/ConnectionMenuBootstrap.ts    |  18 +-
 .../DatabaseAuthDialog/DatabaseAuthDialog.tsx |   6 +-
 .../packages/plugin-connections/src/index.ts  |   1 -
 .../ACTION_DATA_VIEWER_GROUPING_CONFIGURE.ts  |   0
 ...ON_DATA_VIEWER_GROUPING_SHOW_DUPLICATES.ts |   0
 .../DVGroupingColumnEditorDialog.m.css        |   0
 .../DVGroupingColumnEditorDialog.tsx          |   0
 .../GroupingColumnEditorTable.m.css           |   0
 .../GroupingColumnEditorTable.tsx             |  48 +--
 .../GroupingTableItem.tsx                     |   0
 .../src/DVResultSetGroupingPluginBootstrap.ts |   0
 .../src/DVResultSetGroupingPresentation.tsx   |   0
 .../DATA_CONTEXT_DV_DDM_RS_GROUPING.ts        |   0
 .../src/GroupingDataSource.ts                 |   0
 .../src/IGroupingQueryState.ts                |   0
 .../src/locales/en.ts                         |   0
 .../src/locales/it.ts                         |   0
 .../src/locales/ru.ts                         |   0
 .../src/locales/zh.ts                         |   0
 .../src/useGroupingDataModel.ts               |   0
 .../AutoRefresh/AutoRefreshSettingsDialog.tsx |   6 +-
 .../TableViewer/TableFooter/TableFooter.tsx   |   6 +-
 .../ConnectionSchemaManagerBootstrap.ts       |  42 +-
 .../FiltersTable.tsx                          |   6 +-
 .../src/NavNodes/ResourceFoldersBootstrap.ts  |  14 +-
 .../plugin-projects/src/FolderDialog.tsx      |   6 +-
 .../src/PluginBootstrap.ts                    |   6 +-
 .../src/SaveScriptDialog.tsx                  |   6 +-
 .../SqlGenerators/SqlGeneratorsBootstrap.ts   |   5 +-
 .../UserProfileForm/IUserProfileFormState.ts  |   2 +-
 .../src/UserProfileForm/UserForm.tsx          |  10 +-
 .../UserProfileForm/UserProfileFormState.ts   |   3 +-
 199 files changed, 3039 insertions(+), 2561 deletions(-)
 mode change 100644 => 100755 deploy/build-sqlite.sh
 create mode 100644 webapp/packages/core-blocks/src/FormControls/Form.tsx
 delete mode 100644 webapp/packages/core-blocks/src/FormControls/SubmittingForm.tsx
 create mode 100644 webapp/packages/core-blocks/src/FormControls/useCustomInputValidation.ts
 create mode 100644 webapp/packages/core-blocks/src/FormControls/useForm.ts
 create mode 100644 webapp/packages/core-blocks/src/StaticImage.m.css
 create mode 100644 webapp/packages/core-ui/src/Form/DATA_CONTEXT_FORM_STATE.ts
 create mode 100644 webapp/packages/core-ui/src/Form/FormBaseService.ts
 rename webapp/packages/{plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/IUserProfileFormState.ts => core-ui/src/Form/FormMode.ts} (54%)
 create mode 100644 webapp/packages/core-ui/src/Form/FormPart.ts
 create mode 100644 webapp/packages/core-ui/src/Form/FormState.ts
 create mode 100644 webapp/packages/core-ui/src/Form/IFormPart.ts
 create mode 100644 webapp/packages/core-ui/src/Form/IFormProps.ts
 create mode 100644 webapp/packages/core-ui/src/Form/IFormState.ts
 create mode 100644 webapp/packages/core-ui/src/Form/IFormStateInfo.ts
 create mode 100644 webapp/packages/core-ui/src/Form/formStateContext.ts
 create mode 100644 webapp/packages/core-ui/src/Form/formStatusContext.ts
 create mode 100644 webapp/packages/core-ui/src/Form/formValidationContext.ts
 create mode 100644 webapp/packages/core-ui/src/Tabs/DATA_CONTEXT_TABS_FORM_VALIDATION.ts
 create mode 100644 webapp/packages/core-view/src/Action/Actions/ACTION_CREATE.ts
 create mode 100644 webapp/packages/core-view/src/DataContext/DATA_CONTEXT_DI_PROVIDER.ts
 create mode 100644 webapp/packages/core-view/src/DataContext/dataContextAddDIProvider.ts
 create mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/ADMINISTRATION_ITEM_USER_CREATE_PARAM.ts
 delete mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/CreateMetaParameter.tsx
 delete mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/CreateMetaParameterService.ts
 delete mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/MetaParameterForm.tsx
 delete mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoForm.tsx
 delete mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoPanel.tsx
 delete mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoTab.tsx
 delete mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParametersForm.tsx
 delete mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserProfileFormState.ts
 delete mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetaParameterEdit.tsx
 delete mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetaParameterEditController.ts
 delete mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetaParameters.tsx
 delete mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetaParametersController.ts
 delete mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetadataParam.tsx
 delete mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/UserDetailsInfo/Origin.tsx
 create mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserForm.m.css
 create mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserForm.tsx
 create mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserFormService.ts
 create mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserFormState.ts
 delete mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/ConnectionAccess.tsx
 delete mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/ConnectionAccessTabBootstrap.ts
 create mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/DATA_CONTEXT_USER_FORM_CONNECTION_ACCESS_PART.ts
 create mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/UserFormConnectionAccess.tsx
 create mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/UserFormConnectionAccessPanel.tsx
 create mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/UserFormConnectionAccessPart.ts
 create mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/UserFormConnectionAccessPartBootstrap.ts
 create mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/UserFormConnectionTableItem.tsx
 create mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/DATA_CONTEXT_USER_FORM_INFO_PART.ts
 create mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/IUserFormInfoState.ts
 create mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfo.tsx
 create mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoCredentials.tsx
 create mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoMetaParameters.tsx
 create mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoPart.ts
 create mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoPartBootstrap.ts
 create mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoPartService.ts
 create mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoTeams.tsx
 rename webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/{OriginInfoPanel.tsx => Origin/UserFormOriginInfoPanel.tsx} (65%)
 create mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Origin/UserFormOriginInfoTab.tsx
 create mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Origin/UserFormOriginPartBootstrap.ts
 rename webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/{getOriginTabId.ts => Origin/getUserFormOriginTabId.ts} (81%)
 delete mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/OriginInfoTab.tsx
 delete mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserForm.tsx
 delete mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserFormController.ts
 delete mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserFormService.ts
 delete mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserInfo.tsx
 create mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministration.m.css
 create mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUserBootstrap.ts
 create mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserCredentialsList.m.css
 rename webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/{UserDetailsInfo/Origin.tsx => UserCredentialsList.tsx} (77%)
 delete mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserDetailsInfo/Origin.m.css
 create mode 100644 webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserEdit.m.css
 delete mode 100644 webapp/packages/plugin-connections/src/ConnectionForm/Contexts/connectionFormStateContext.ts
 mode change 100755 => 100644 webapp/packages/plugin-data-viewer-result-set-grouping/src/Actions/ACTION_DATA_VIEWER_GROUPING_CONFIGURE.ts
 mode change 100755 => 100644 webapp/packages/plugin-data-viewer-result-set-grouping/src/Actions/ACTION_DATA_VIEWER_GROUPING_SHOW_DUPLICATES.ts
 mode change 100755 => 100644 webapp/packages/plugin-data-viewer-result-set-grouping/src/DVGroupingColumnEditorDialog/DVGroupingColumnEditorDialog.m.css
 mode change 100755 => 100644 webapp/packages/plugin-data-viewer-result-set-grouping/src/DVGroupingColumnEditorDialog/DVGroupingColumnEditorDialog.tsx
 mode change 100755 => 100644 webapp/packages/plugin-data-viewer-result-set-grouping/src/DVGroupingColumnEditorDialog/GroupingColumnEditorTable.m.css
 mode change 100755 => 100644 webapp/packages/plugin-data-viewer-result-set-grouping/src/DVGroupingColumnEditorDialog/GroupingColumnEditorTable.tsx
 mode change 100755 => 100644 webapp/packages/plugin-data-viewer-result-set-grouping/src/DVGroupingColumnEditorDialog/GroupingTableItem.tsx
 mode change 100755 => 100644 webapp/packages/plugin-data-viewer-result-set-grouping/src/DVResultSetGroupingPluginBootstrap.ts
 mode change 100755 => 100644 webapp/packages/plugin-data-viewer-result-set-grouping/src/DVResultSetGroupingPresentation.tsx
 mode change 100755 => 100644 webapp/packages/plugin-data-viewer-result-set-grouping/src/DataContext/DATA_CONTEXT_DV_DDM_RS_GROUPING.ts
 mode change 100755 => 100644 webapp/packages/plugin-data-viewer-result-set-grouping/src/GroupingDataSource.ts
 mode change 100755 => 100644 webapp/packages/plugin-data-viewer-result-set-grouping/src/IGroupingQueryState.ts
 mode change 100755 => 100644 webapp/packages/plugin-data-viewer-result-set-grouping/src/locales/en.ts
 mode change 100755 => 100644 webapp/packages/plugin-data-viewer-result-set-grouping/src/locales/it.ts
 mode change 100755 => 100644 webapp/packages/plugin-data-viewer-result-set-grouping/src/locales/ru.ts
 mode change 100755 => 100644 webapp/packages/plugin-data-viewer-result-set-grouping/src/locales/zh.ts
 mode change 100755 => 100644 webapp/packages/plugin-data-viewer-result-set-grouping/src/useGroupingDataModel.ts

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 0f1785c79b..f35c971de3 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -36,7 +36,12 @@
     {
       "label": "Build CE",
       "type": "shell",
-      "command": "./build-sqlite.bat",
+      "windows": {
+        "command": "./build-sqlite.bat"
+      },
+      "osx": {
+        "command": "./build-sqlite.sh"
+      },
       "options": {
         "cwd": "${workspaceFolder}/deploy"
       },
diff --git a/deploy/build-sqlite.sh b/deploy/build-sqlite.sh
old mode 100644
new mode 100755
diff --git a/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls b/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls
index f2f48564e8..04fe3be838 100644
--- a/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls
+++ b/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls
@@ -117,6 +117,7 @@ type ServerConfig {
     hostName: String! @deprecated # use container id instead
     containerId: String!
     defaultAuthRole: String
+    defaultUserTeam: String # [23.2.2]
 
     anonymousAccessEnabled: Boolean!
     supportsCustomConnections: Boolean!
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebServerConfig.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebServerConfig.java
index e932737e78..a717f5bb4e 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebServerConfig.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebServerConfig.java
@@ -212,4 +212,9 @@ public class WebServerConfig {
     public String getDefaultAuthRole() {
         return application.getDefaultAuthRole();
     }
+
+    @Property
+    public String getDefaultUserTeam() {
+        return application.getAppConfiguration().getDefaultUserTeam();
+    }
 }
diff --git a/webapp/packages/core-authentication/src/UsersResource.ts b/webapp/packages/core-authentication/src/UsersResource.ts
index ffb55bcece..b1c7900403 100644
--- a/webapp/packages/core-authentication/src/UsersResource.ts
+++ b/webapp/packages/core-authentication/src/UsersResource.ts
@@ -56,12 +56,6 @@ export const UsersResourceNewUsers = resourceKeyListAlias('@users-resource/new-u
 
 interface UserCreateOptions {
   userId: string;
-  teams: string[];
-  credentials: IAuthCredentials;
-  metaParameters: Record<string, any>;
-  grantedConnections: string[];
-  enabled: boolean;
-  authRole?: string;
 }
 
 @injectable()
@@ -129,30 +123,17 @@ export class UsersResource extends CachedMapResource<string, AdminUser, UserReso
     await this.graphQLService.sdk.saveUserMetaParameters({ userId, parameters });
   }
 
-  async create({ userId, teams, credentials, metaParameters, grantedConnections, enabled, authRole }: UserCreateOptions): Promise<AdminUser> {
+  async create({ userId }: UserCreateOptions): Promise<AdminUser> {
     const { user } = await this.graphQLService.sdk.createUser({
       userId,
-      enabled,
-      authRole,
+      enabled: false,
       ...this.getDefaultIncludes(),
       ...this.getIncludesMap(userId),
     });
 
-    try {
-      await this.updateCredentials(userId, credentials);
-
-      for (const teamId of teams) {
-        await this.grantTeam(userId, teamId, true);
-      }
-
-      await this.setConnections(userId, grantedConnections);
-      await this.setMetaParameters(userId, metaParameters);
-      const user = (await this.refresh(userId)) as unknown as AdminUserNew;
-      user[NEW_USER_SYMBOL] = true;
-    } catch (exception: any) {
-      this.delete(userId);
-      throw exception;
-    }
+    const newUser = user as unknown as AdminUserNew;
+    newUser[NEW_USER_SYMBOL] = true;
+    this.set(user.userId, newUser);
 
     return this.get(user.userId)!;
   }
diff --git a/webapp/packages/core-blocks/src/Containers/Group.m.css b/webapp/packages/core-blocks/src/Containers/Group.m.css
index d072fbf385..dae0c832fc 100644
--- a/webapp/packages/core-blocks/src/Containers/Group.m.css
+++ b/webapp/packages/core-blocks/src/Containers/Group.m.css
@@ -31,4 +31,8 @@
   &.center {
     margin: 0 auto;
   }
+
+  &.overflow {
+    overflow: auto;
+  }
 }
diff --git a/webapp/packages/core-blocks/src/FormControls/Form.tsx b/webapp/packages/core-blocks/src/FormControls/Form.tsx
new file mode 100644
index 0000000000..082b3756c2
--- /dev/null
+++ b/webapp/packages/core-blocks/src/FormControls/Form.tsx
@@ -0,0 +1,67 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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, { forwardRef, useState } from 'react';
+
+import { useCombinedRef } from '../useCombinedRef';
+import { useFocus } from '../useFocus';
+import { FormChangeHandler, FormContext, IFormContext } from './FormContext';
+import { useForm } from './useForm';
+
+type FormDetailedProps = Omit<React.DetailedHTMLProps<React.FormHTMLAttributes<HTMLFormElement>, HTMLFormElement>, 'onChange' | 'onSubmit'> & {
+  context?: IFormContext;
+  disabled?: boolean;
+  disableEnterSubmit?: boolean;
+  focusFirstChild?: boolean;
+  onSubmit?: (event?: SubmitEvent) => Promise<void> | void;
+  onChange?: FormChangeHandler;
+};
+
+export const Form = forwardRef<HTMLFormElement, FormDetailedProps>(function Form(
+  { context, disabled: disabledProp, disableEnterSubmit, focusFirstChild, children, onSubmit, onChange, ...rest },
+  ref,
+) {
+  const [focusedRef] = useFocus<HTMLFormElement>({ focusFirstChild });
+  const [disabledLocal, setDisabledLocal] = useState(false);
+
+  const disabled = disabledLocal || disabledProp || false;
+
+  const formContext = useForm({
+    disableEnterSubmit,
+    parent: context,
+    onSubmit(event) {
+      const result = onSubmit?.(event);
+
+      if (result instanceof Promise) {
+        setDisabledLocal(true);
+        result.finally(() => {
+          setDisabledLocal(false);
+        });
+      }
+    },
+    onChange,
+  });
+
+  const setFormRef = useCombinedRef<HTMLFormElement>(formContext.setRef, focusedRef, ref);
+
+  if (formContext.parent && formContext.parent !== context) {
+    return (
+      <fieldset disabled={disabled} className={rest.className}>
+        <FormContext.Provider value={formContext}>{children}</FormContext.Provider>
+      </fieldset>
+    );
+  }
+
+  return (
+    <form {...rest} ref={setFormRef}>
+      <fieldset disabled={disabled} className={rest.className}>
+        <FormContext.Provider value={formContext}>{children}</FormContext.Provider>
+      </fieldset>
+      <button type="submit" disabled={disableEnterSubmit} aria-hidden={disableEnterSubmit} hidden />
+    </form>
+  );
+});
diff --git a/webapp/packages/core-blocks/src/FormControls/FormContext.ts b/webapp/packages/core-blocks/src/FormControls/FormContext.ts
index 6714dfb38b..98042f8c0e 100644
--- a/webapp/packages/core-blocks/src/FormControls/FormContext.ts
+++ b/webapp/packages/core-blocks/src/FormControls/FormContext.ts
@@ -7,7 +7,7 @@
  */
 import { createContext } from 'react';
 
-import type { IExecutor } from '@cloudbeaver/core-executor';
+import type { IExecutor, SyncExecutor } from '@cloudbeaver/core-executor';
 
 export type FormChangeValues = string | number | boolean | FileList | null | undefined;
 export type FormChangeHandler = (value: FormChangeValues, name: string | undefined) => void;
@@ -19,9 +19,18 @@ export interface IChangeData {
 }
 
 export interface IFormContext {
-  changeExecutor: IExecutor<IChangeData>;
+  ref: HTMLFormElement | null;
+  onValidate: SyncExecutor;
+  onSubmit: SyncExecutor;
+  onChange: IExecutor<IChangeData>;
+  parent: IFormContext | null;
+  disableEnterSubmit: boolean;
+  setRef: (ref: HTMLFormElement | null) => void;
   change: FormChangeHandler;
   keyDown: KeyHandler;
+  validate: () => boolean;
+  reportValidity: () => boolean;
+  submit: (event?: SubmitEvent) => void;
 }
 
 export const FormContext = createContext<IFormContext | null>(null);
diff --git a/webapp/packages/core-blocks/src/FormControls/InputField.tsx b/webapp/packages/core-blocks/src/FormControls/InputField.tsx
index 1d6f2ea509..7952890f72 100644
--- a/webapp/packages/core-blocks/src/FormControls/InputField.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/InputField.tsx
@@ -20,6 +20,7 @@ import { Loader } from '../Loader/Loader';
 import { useTranslate } from '../localization/useTranslate';
 import { s } from '../s';
 import { useCombinedHandler } from '../useCombinedHandler';
+import { useCombinedRef } from '../useCombinedRef';
 import { useMergeRefs } from '../useMergeRefs';
 import { useS } from '../useS';
 import { useStateDelay } from '../useStateDelay';
@@ -97,7 +98,7 @@ export const InputField: InputFieldType = observer(
     ref,
   ) {
     const inputRef = useRef<HTMLInputElement | null>(null);
-    const mergedRef = useMergeRefs(inputRef, ref);
+    const mergedRef = useCombinedRef(inputRef, ref);
     const capsLock = useCapsLockTracker();
     const [passwordRevealed, setPasswordRevealed] = useState(false);
     const translate = useTranslate();
@@ -137,9 +138,9 @@ export const InputField: InputFieldType = observer(
     const handleKeyDown = useCombinedHandler(rest.onKeyDown, capsLock.handleKeyDown, context?.keyDown);
 
     const passwordType = rest.type === 'password';
-    const uncontrolled = passwordType && !canShowPassword;
+    let uncontrolled = passwordType && !canShowPassword;
 
-    let value: any = valueControlled ?? defaultValue ?? undefined;
+    let value: any = valueControlled ?? undefined;
 
     if (state && name !== undefined && name in state) {
       value = state[name];
@@ -153,6 +154,8 @@ export const InputField: InputFieldType = observer(
       description = translate('ui_capslock_on');
     }
 
+    uncontrolled ||= value === undefined;
+
     useLayoutEffect(() => {
       if (uncontrolled && isNotNullDefined(value) && inputRef.current) {
         inputRef.current.value = value;
@@ -176,6 +179,7 @@ export const InputField: InputFieldType = observer(
             type={passwordRevealed ? 'text' : rest.type}
             name={name}
             value={uncontrolled ? undefined : value ?? ''}
+            defaultValue={defaultValue}
             className={styles.input}
             onChange={handleChange}
             onBlur={handleBlur}
diff --git a/webapp/packages/core-blocks/src/FormControls/SubmittingForm.tsx b/webapp/packages/core-blocks/src/FormControls/SubmittingForm.tsx
deleted file mode 100644
index be627f6e76..0000000000
--- a/webapp/packages/core-blocks/src/FormControls/SubmittingForm.tsx
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2023 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, { forwardRef, useContext, useState } from 'react';
-
-import { Executor } from '@cloudbeaver/core-executor';
-
-import { useCombinedRef } from '../useCombinedRef';
-import { useObjectRef } from '../useObjectRef';
-import { FormChangeHandler, FormContext, IChangeData, IFormContext } from './FormContext';
-
-export interface IFormStateInfo {
-  edited: boolean;
-  disabled: boolean;
-  readonly: boolean;
-  statusMessage: string | null;
-}
-
-type FormDetailedProps = Omit<React.DetailedHTMLProps<React.FormHTMLAttributes<HTMLFormElement>, HTMLFormElement>, 'onChange' | 'onSubmit'> & {
-  disabled?: boolean;
-  disableEnterSubmit?: boolean;
-  onSubmit?: (event?: React.FormEvent<HTMLFormElement>) => Promise<void> | void;
-  onChange?: FormChangeHandler;
-};
-
-export const SubmittingForm = forwardRef<HTMLFormElement, FormDetailedProps>(function SubmittingForm(
-  { disabled: disabledProp, disableEnterSubmit, children, onSubmit, onChange = () => {}, ...rest },
-  ref,
-) {
-  const [formRef, setFormInnerRef] = useState<HTMLFormElement | null>(null);
-  const setFormRef = useCombinedRef<HTMLFormElement>(setFormInnerRef, ref);
-  let [disabled, setDisabled] = useState(false);
-
-  disabled = disabled || disabledProp || false;
-
-  const props = useObjectRef(
-    () => ({
-      handleSubmit(e: React.FormEvent<HTMLFormElement>) {
-        e.preventDefault();
-
-        setDisabled(true);
-        const result = this.onSubmit?.(e);
-
-        if (result instanceof Promise) {
-          result.finally(() => {
-            setDisabled(false);
-          });
-        } else {
-          setDisabled(false);
-        }
-      },
-    }),
-    {
-      formRef,
-      disableEnterSubmit,
-      parentContext: useContext(FormContext),
-      onChange,
-      onSubmit,
-    },
-    ['handleSubmit'],
-  );
-
-  const context = useObjectRef<IFormContext>(
-    () => ({
-      changeExecutor: new Executor<IChangeData>(),
-      change(value, name) {
-        props.onChange(value, name);
-        props.parentContext?.change(value, name);
-        this.changeExecutor.execute({ value, name });
-      },
-      keyDown(event: React.KeyboardEvent<HTMLInputElement>) {
-        if (event.key === 'Enter') {
-          const form = event.currentTarget.closest('form');
-          if (form) {
-            event.preventDefault();
-            const submitButton = form.querySelector<HTMLButtonElement>('button[type=submit]');
-            if (submitButton) {
-              submitButton.click();
-            }
-          }
-        }
-        props.parentContext?.keyDown(event);
-      },
-    }),
-    false,
-    ['change', 'keyDown'],
-  );
-
-  return (
-    <form {...rest} ref={setFormRef} onSubmit={e => props.handleSubmit(e)}>
-      <fieldset disabled={disabled} className={rest.className}>
-        <FormContext.Provider value={context}>{children}</FormContext.Provider>
-      </fieldset>
-      <button type="submit" disabled={disableEnterSubmit} aria-hidden={disableEnterSubmit} hidden />
-    </form>
-  );
-});
diff --git a/webapp/packages/core-blocks/src/FormControls/useCustomInputValidation.ts b/webapp/packages/core-blocks/src/FormControls/useCustomInputValidation.ts
new file mode 100644
index 0000000000..a4e936afe0
--- /dev/null
+++ b/webapp/packages/core-blocks/src/FormControls/useCustomInputValidation.ts
@@ -0,0 +1,63 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { useContext, useEffect, useRef } from 'react';
+
+import { ExecutorInterrupter } from '@cloudbeaver/core-executor';
+
+import { useExecutor } from '../useExecutor';
+import { FormContext } from './FormContext';
+
+export function useCustomInputValidation<T = void>(validation: (value: T) => string | null): React.RefObject<HTMLInputElement> {
+  const context = useContext(FormContext);
+  const inputRef = useRef<HTMLInputElement>(null);
+
+  useExecutor({
+    executor: context?.onValidate,
+    handlers: [
+      function validationHandler(_, context) {
+        if (!inputRef.current) {
+          return;
+        }
+
+        let value: T = undefined as unknown as T;
+
+        if (inputRef.current instanceof HTMLInputElement) {
+          value = inputRef.current.value as unknown as T;
+        }
+
+        const result = validation(value);
+
+        if (typeof result === 'string') {
+          inputRef.current.setCustomValidity(result);
+          ExecutorInterrupter.interrupt(context);
+        } else {
+          inputRef.current?.setCustomValidity('');
+        }
+      },
+    ],
+  });
+
+  useEffect(() => {
+    const element = inputRef.current;
+    if (!element) {
+      return;
+    }
+
+    function resetValidationMessage() {
+      element?.setCustomValidity('');
+    }
+
+    element.addEventListener('input', resetValidationMessage);
+
+    return () => {
+      element?.removeEventListener('input', resetValidationMessage);
+    };
+  });
+
+  return inputRef;
+}
diff --git a/webapp/packages/core-blocks/src/FormControls/useForm.ts b/webapp/packages/core-blocks/src/FormControls/useForm.ts
new file mode 100644
index 0000000000..711aa0c0c4
--- /dev/null
+++ b/webapp/packages/core-blocks/src/FormControls/useForm.ts
@@ -0,0 +1,145 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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, { useContext, useState } from 'react';
+
+import { Executor, ExecutorInterrupter, SyncExecutor } from '@cloudbeaver/core-executor';
+
+import { useExecutor } from '../useExecutor';
+import { useObjectRef } from '../useObjectRef';
+import { FormChangeHandler, FormContext, type IChangeData, type IFormContext } from './FormContext';
+
+interface IOptions {
+  parent?: IFormContext;
+  disableEnterSubmit?: boolean;
+  onSubmit?: (event?: SubmitEvent | undefined) => void;
+  onChange?: FormChangeHandler;
+}
+
+export function useForm(options?: IOptions): IFormContext {
+  let parentForm = useContext(FormContext);
+  const [submittingExecutor] = useState(() => new SyncExecutor());
+  const [validationExecutor] = useState(() => new SyncExecutor());
+  const [changeExecutor] = useState(() => new Executor<IChangeData>());
+
+  if (options?.parent) {
+    parentForm = options.parent;
+  }
+
+  const disableEnterSubmit = options?.disableEnterSubmit ?? parentForm?.disableEnterSubmit ?? false;
+
+  useExecutor({
+    executor: parentForm?.onChange,
+    before: changeExecutor,
+  });
+
+  useExecutor({
+    executor: changeExecutor,
+    handlers: [({ value, name }) => options?.onChange?.(value, name)],
+  });
+
+  useExecutor({
+    executor: parentForm?.onSubmit,
+    before: submittingExecutor,
+  });
+
+  useExecutor({
+    executor: submittingExecutor,
+    handlers: [() => options?.onSubmit?.()],
+  });
+
+  const context = useObjectRef<IFormContext>(
+    () => ({
+      ref: null,
+      onValidate: validationExecutor,
+      onChange: changeExecutor,
+      onSubmit: submittingExecutor,
+      setRef(ref) {
+        if (this.parent) {
+          this.parent.setRef(ref);
+        } else {
+          if (this.ref) {
+            this.ref.removeEventListener('submit', this.submit);
+          }
+          this.ref = ref;
+          if (ref) {
+            ref.addEventListener('submit', this.submit);
+          }
+        }
+      },
+      change(value, name) {
+        if (this.parent) {
+          this.parent.change(value, name);
+        } else {
+          this.onChange.execute({ value, name });
+        }
+      },
+      keyDown(event: React.KeyboardEvent<HTMLInputElement>) {
+        if (this.parent) {
+          this.parent.keyDown(event);
+        } else if (event.key === 'Enter' && this.disableEnterSubmit === false) {
+          event.preventDefault();
+          this.submit();
+        }
+      },
+      submit(event) {
+        if (this.parent) {
+          this.parent.submit(event);
+        } else {
+          event?.preventDefault();
+
+          if (this.validate()) {
+            this.onSubmit.execute();
+          }
+        }
+      },
+      reportValidity() {
+        if (this.parent) {
+          return this.parent.reportValidity();
+        }
+        return this.ref?.reportValidity() ?? false;
+      },
+      validate() {
+        if (this.parent) {
+          return this.parent.validate();
+        } else {
+          const validationContext = this.onValidate.execute();
+          const interrupted = ExecutorInterrupter.isInterrupted(validationContext);
+
+          if (interrupted) {
+            context.ref?.reportValidity();
+          }
+          return interrupted === false;
+        }
+      },
+    }),
+    { parent: parentForm, disableEnterSubmit },
+    ['setRef', 'change', 'keyDown', 'submit', 'validate'],
+  );
+
+  useExecutor({
+    executor: parentForm?.onValidate,
+    before: validationExecutor,
+  });
+
+  useExecutor({
+    executor: validationExecutor,
+    handlers: [
+      function validateFormConstraints(_, executorContext) {
+        if (!context.ref) {
+          return;
+        }
+
+        if (context.ref.checkValidity() === false) {
+          ExecutorInterrupter.interrupt(executorContext);
+        }
+      },
+    ],
+  });
+
+  return context;
+}
diff --git a/webapp/packages/core-blocks/src/Loader/useAutoLoad.ts b/webapp/packages/core-blocks/src/Loader/useAutoLoad.ts
index 0dfd750c7f..c74e4fdf48 100644
--- a/webapp/packages/core-blocks/src/Loader/useAutoLoad.ts
+++ b/webapp/packages/core-blocks/src/Loader/useAutoLoad.ts
@@ -7,7 +7,7 @@
  */
 import { useEffect, useState } from 'react';
 
-import { ILoadableState, isLoadableStateHasException } from '@cloudbeaver/core-utils';
+import type { ILoadableState } from '@cloudbeaver/core-utils';
 
 import { getComputed } from '../getComputed';
 
@@ -24,29 +24,35 @@ export function useAutoLoad(component: { name: string }, state: IAutoLoadable |
   for (const loader of state as IAutoLoadable[]) {
     getComputed(
       // activate mobx subscriptions
-      () => (!loader.isLoaded() || loader.isOutdated?.() === true) && !isLoadableStateHasException(loader),
+      () => (!loader.isLoaded() || loader.isOutdated?.() === true) && !loader.isError(),
     );
   }
 
+  const obj = {
+    [loadFunctionName]: () => {
+      if (!enabled) {
+        return;
+      }
+
+      for (const loader of state as IAutoLoadable[]) {
+        if (loader.isError() || (loader.lazy === true && !lazy)) {
+          continue;
+        }
+
+        if (!loader.isLoaded() || loader.isOutdated?.() === true) {
+          loader.load();
+        }
+      }
+    },
+  };
+
+  const promises = state.map(loader => loader.promise).filter(Boolean) as Promise<any>[];
+
+  if (promises.length > 0) {
+    throw Promise.all(promises);
+  }
+
   useEffect(() => {
-    const obj = {
-      [loadFunctionName]: () => {
-        if (!enabled) {
-          return;
-        }
-
-        for (const loader of state as IAutoLoadable[]) {
-          if (isLoadableStateHasException(loader) || (loader.lazy === true && !lazy)) {
-            continue;
-          }
-
-          if (!loader.isLoaded() || loader.isOutdated?.() === true) {
-            loader.load();
-          }
-        }
-      },
-    };
-
     obj[loadFunctionName]();
   });
 }
diff --git a/webapp/packages/core-blocks/src/ResourcesHooks/useResource.ts b/webapp/packages/core-blocks/src/ResourcesHooks/useResource.ts
index bea59762e6..6f4defee11 100644
--- a/webapp/packages/core-blocks/src/ResourcesHooks/useResource.ts
+++ b/webapp/packages/core-blocks/src/ResourcesHooks/useResource.ts
@@ -172,15 +172,15 @@ export function useResource<
   });
 
   function getData(): any {
-    if (actions?.active === false) {
-      if (isResourceKeyList(propertiesRef.key) || isResourceKeyListAlias(propertiesRef.key)) {
-        return [];
-      }
-
-      return undefined;
+    if (propertiesRef.resource instanceof CachedDataResource) {
+      return propertiesRef.resource.data;
     }
     if (propertiesRef.resource instanceof CachedMapResource) {
-      if (propertiesRef.key === null) {
+      if (actions?.active === false || propertiesRef.key === null) {
+        if (isResourceKeyList(propertiesRef.key) || isResourceKeyListAlias(propertiesRef.key)) {
+          return [];
+        }
+
         return undefined;
       }
       return propertiesRef.resource.get(propertiesRef.key);
diff --git a/webapp/packages/core-blocks/src/StaticImage.m.css b/webapp/packages/core-blocks/src/StaticImage.m.css
new file mode 100644
index 0000000000..20015d3518
--- /dev/null
+++ b/webapp/packages/core-blocks/src/StaticImage.m.css
@@ -0,0 +1,10 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+.block {
+  display: block;
+}
diff --git a/webapp/packages/core-blocks/src/StaticImage.tsx b/webapp/packages/core-blocks/src/StaticImage.tsx
index d5638ceb91..cebae9a23c 100644
--- a/webapp/packages/core-blocks/src/StaticImage.tsx
+++ b/webapp/packages/core-blocks/src/StaticImage.tsx
@@ -7,19 +7,26 @@
  */
 import { GlobalConstants, isValidUrl } from '@cloudbeaver/core-utils';
 
+import { s } from './s';
+import style from './StaticImage.m.css';
+import { useS } from './useS';
+
 interface Props {
   icon?: string;
   className?: string;
   title?: string;
+  width?: number;
+  block?: boolean;
   onClick?: (e: React.MouseEvent) => void;
 }
 
-export const StaticImage: React.FC<Props> = function StaticImage({ icon, className, title, onClick }) {
+export const StaticImage: React.FC<Props> = function StaticImage({ icon, className, title, width, block, onClick }) {
+  const styles = useS(style);
   if (!icon) {
     return null;
   }
 
   const url = isValidUrl(icon) ? icon : GlobalConstants.absoluteUrl(icon);
 
-  return <img className={className} src={url} title={title} onClick={onClick} />;
+  return <img className={s(styles, { block }, className)} src={url} title={title} width={width} onClick={onClick} />;
 };
diff --git a/webapp/packages/core-blocks/src/StatusMessage.tsx b/webapp/packages/core-blocks/src/StatusMessage.tsx
index c6ecb3eb1e..6493721618 100644
--- a/webapp/packages/core-blocks/src/StatusMessage.tsx
+++ b/webapp/packages/core-blocks/src/StatusMessage.tsx
@@ -41,16 +41,16 @@ const styles = css`
 
 interface Props {
   message?: string | string[] | null;
-  status?: ENotificationType;
+  type?: ENotificationType | null;
   exception?: Error | null;
   className?: string;
   onShowDetails?: () => void;
 }
 
-export const StatusMessage = observer<Props>(function StatusMessage({ status, message, exception = null, className, onShowDetails }) {
+export const StatusMessage = observer<Props>(function StatusMessage({ type, message, exception = null, className, onShowDetails }) {
   const translate = useTranslate();
   const errorDetails = useErrorDetails(exception);
-  const isError = status === ENotificationType.Error || exception !== null;
+  const isError = type === ENotificationType.Error || exception !== null;
 
   if (Array.isArray(message)) {
     message = message.map(m => translate(m)).join(', ');
@@ -63,7 +63,7 @@ export const StatusMessage = observer<Props>(function StatusMessage({ status, me
 
   if (isError) {
     icon = '/icons/error_icon.svg';
-  } else if (status === ENotificationType.Success) {
+  } else if (type === ENotificationType.Success) {
     icon = '/icons/success_icon.svg';
   }
 
diff --git a/webapp/packages/core-blocks/src/Table/Table.tsx b/webapp/packages/core-blocks/src/Table/Table.tsx
index 28ef5d0e1c..9e01d10411 100644
--- a/webapp/packages/core-blocks/src/Table/Table.tsx
+++ b/webapp/packages/core-blocks/src/Table/Table.tsx
@@ -7,7 +7,7 @@
  */
 import { action, computed, observable } from 'mobx';
 import { observer } from 'mobx-react-lite';
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 
 import { s } from '../s';
 import { useObjectRef } from '../useObjectRef';
@@ -95,8 +95,6 @@ export const Table = observer<React.PropsWithChildren<Props>>(function Table({
     { keys, isItemSelectable },
   );
 
-  const isExpanded = useMemo(() => computed(() => Array.from(expanded.values()).some(Boolean)), [expanded]);
-
   const setItemSelect = useCallback((item: any, state: boolean) => {
     selected.set(item, state);
     if (props.onSelect) {
@@ -119,7 +117,7 @@ export const Table = observer<React.PropsWithChildren<Props>>(function Table({
 
   return (
     <TableContext.Provider value={context}>
-      <table className={s(styles, { table: true, expanded: isExpanded.get(), big: size === 'big' }, className)}>{children}</table>
+      <table className={s(styles, { table: true, big: size === 'big' }, className)}>{children}</table>
     </TableContext.Provider>
   );
 });
diff --git a/webapp/packages/core-blocks/src/Table/TableItem.tsx b/webapp/packages/core-blocks/src/Table/TableItem.tsx
index 9cfa042c36..2c17977b14 100644
--- a/webapp/packages/core-blocks/src/Table/TableItem.tsx
+++ b/webapp/packages/core-blocks/src/Table/TableItem.tsx
@@ -21,13 +21,14 @@ import { TableContext } from './TableContext';
 import rowStyles from './TableItem.m.css';
 import { ITableItemContext, TableItemContext } from './TableItemContext';
 
-interface ExpandProps {
-  item: any;
+export interface TableItemExpandProps<T> {
+  item: T;
+  onClose: () => void;
 }
 
-interface Props {
-  item: any;
-  expandElement?: React.FunctionComponent<ExpandProps>;
+interface Props<T> extends React.PropsWithChildren {
+  item: T;
+  expandElement?: React.FunctionComponent<TableItemExpandProps<T>>;
   selectOnItem?: boolean;
   selectDisabled?: boolean;
   disabled?: boolean;
@@ -37,7 +38,11 @@ interface Props {
   onDoubleClick?: () => void;
 }
 
-export const TableItem = observer<React.PropsWithChildren<Props>>(function TableItem({
+interface ITableItemComponent {
+  <T>(props: Props<T>): React.ReactElement<any, any> | null;
+}
+
+export const TableItem: ITableItemComponent = observer(function TableItem({
   item,
   expandElement,
   selectOnItem,
@@ -101,6 +106,10 @@ export const TableItem = observer<React.PropsWithChildren<Props>>(function Table
     [onDoubleClick],
   );
 
+  const handleClose = useCallback(() => {
+    context.setItemExpand(item, false);
+  }, [context, item]);
+
   const ExpandElement = expandElement;
 
   return (
@@ -117,7 +126,7 @@ export const TableItem = observer<React.PropsWithChildren<Props>>(function Table
         <tr className={s(styles, { noHover: true, expanded: isExpanded, row: true })}>
           <td colSpan={Children.toArray(children).length} className={s(styles, { expandArea: true, cell: true })}>
             <Loader suspense>
-              <ExpandElement item={item} />
+              <ExpandElement item={item} onClose={handleClose} />
             </Loader>
           </td>
         </tr>
diff --git a/webapp/packages/core-blocks/src/Table/TableItemSelect.tsx b/webapp/packages/core-blocks/src/Table/TableItemSelect.tsx
index 84cceac280..d2a6266fe8 100644
--- a/webapp/packages/core-blocks/src/Table/TableItemSelect.tsx
+++ b/webapp/packages/core-blocks/src/Table/TableItemSelect.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, useContext } from 'react';
+import { useContext } from 'react';
 import styled, { css } from 'reshadow';
 
 import { EventContext } from '@cloudbeaver/core-events';
@@ -33,31 +33,22 @@ const styles = css`
 export const TableItemSelect = observer<Props>(function TableItemSelect({ checked, disabled, tooltip, className }) {
   const tableContext = useContext(TableContext);
   const context = useContext(TableItemContext);
+  const selected = checked ?? context?.isSelected();
 
-  const handleClick = useCallback(
-    (event: React.MouseEvent<HTMLInputElement>) => {
-      if (!context) {
-        return;
-      }
-      const state = !context.isSelected();
-      EventContext.set(event, EventTableItemSelectionFlag, state);
+  function handleClick(event: React.MouseEvent<HTMLInputElement>) {
+    if (!context) {
+      return;
+    }
+    EventContext.set(event, EventTableItemSelectionFlag, !selected);
 
-      tableContext?.setItemSelect(context.item, state);
-    },
-    [tableContext, context],
-  );
+    tableContext?.setItemSelect(context.item, !selected);
+  }
 
   if (!context) {
     return null;
   }
 
   return styled(styles)(
-    <Checkbox
-      className={className}
-      title={tooltip}
-      disabled={context.selectDisabled || disabled}
-      checked={checked || context.isSelected()}
-      onClick={handleClick}
-    />,
+    <Checkbox className={className} title={tooltip} disabled={context.selectDisabled || disabled} checked={selected} onClick={handleClick} />,
   );
 });
diff --git a/webapp/packages/core-blocks/src/Table/TableState.ts b/webapp/packages/core-blocks/src/Table/TableState.ts
index db5b2059e6..dc58b842aa 100644
--- a/webapp/packages/core-blocks/src/Table/TableState.ts
+++ b/webapp/packages/core-blocks/src/Table/TableState.ts
@@ -51,15 +51,10 @@ export class TableState {
       selectedList: computed,
       expandedList: computed,
       unselect: action,
-      unexpand: action,
+      collapse: action,
     });
   }
 
-  expand(key: string, value: boolean) {
-    this.expanded.set(key, value);
-    this.onExpand.execute({ key, value });
-  }
-
   unselect(key?: Key): Map<string, boolean> {
     if (key === undefined) {
       this.selected.clear();
@@ -76,7 +71,12 @@ export class TableState {
     return this.selected;
   }
 
-  unexpand(key?: Key): Map<string, boolean> {
+  expand(key: string, value: boolean) {
+    this.expanded.set(key, value);
+    this.onExpand.execute({ key, value });
+  }
+
+  collapse(key?: Key): Map<string, boolean> {
     if (key === undefined) {
       this.expanded.clear();
     } else {
@@ -93,7 +93,7 @@ export class TableState {
   }
 
   reset() {
-    this.unexpand();
+    this.collapse();
     this.unselect();
   }
 }
diff --git a/webapp/packages/core-blocks/src/index.ts b/webapp/packages/core-blocks/src/index.ts
index d0fcbea067..55d1767248 100644
--- a/webapp/packages/core-blocks/src/index.ts
+++ b/webapp/packages/core-blocks/src/index.ts
@@ -155,7 +155,11 @@ export * from './FormControls/Radio';
 export * from './FormControls/RadioGroup';
 export * from './FormControls/RadioGroupContext';
 export * from './FormControls/ShadowInput';
-export * from './FormControls/SubmittingForm';
+export * from './FormControls/Form';
+export * from './FormControls/Textarea';
+export * from './FormControls/useCapsLockTracker';
+export * from './FormControls/useCustomInputValidation';
+export * from './FormControls/useForm';
 export * from './FormControls/Textarea';
 export * from './Link';
 export * from './Cell';
diff --git a/webapp/packages/core-blocks/src/useCombinedRef.ts b/webapp/packages/core-blocks/src/useCombinedRef.ts
index 4a78df8088..2bed47e35c 100644
--- a/webapp/packages/core-blocks/src/useCombinedRef.ts
+++ b/webapp/packages/core-blocks/src/useCombinedRef.ts
@@ -7,8 +7,8 @@
  */
 import { useCallback } from 'react';
 
-export function useCombinedRef<T>(...refs: React.ForwardedRef<T>[]) {
-  return useCallback((instance: T | null) => {
+export function useCombinedRef<T>(...refs: React.Ref<T>[]): React.RefCallback<T> {
+  return useCallback(instance => {
     for (const ref of refs) {
       if (typeof ref === 'function') {
         ref(instance);
diff --git a/webapp/packages/core-blocks/src/useExecutor.ts b/webapp/packages/core-blocks/src/useExecutor.ts
index 472eb73cfc..3a43fffd1b 100644
--- a/webapp/packages/core-blocks/src/useExecutor.ts
+++ b/webapp/packages/core-blocks/src/useExecutor.ts
@@ -12,9 +12,11 @@ import type { IExecutor, IExecutorHandler, IExecutorHandlersCollection } from '@
 import { useObjectRef } from './useObjectRef';
 
 interface IUseExecutorOptions<T> {
-  executor?: IExecutor<T> | IExecutorHandlersCollection<T>;
+  executor?: IExecutorHandlersCollection<T>;
   handlers?: Array<IExecutorHandler<T>>;
   postHandlers?: Array<IExecutorHandler<T>>;
+  next?: IExecutorHandlersCollection<T>;
+  before?: IExecutorHandlersCollection<T>;
 }
 
 export function useExecutor<T>(options: IUseExecutorOptions<T>): void {
@@ -28,6 +30,8 @@ export function useExecutor<T>(options: IUseExecutorOptions<T>): void {
 
     const handlers: Array<IExecutorHandler<T>> = [];
     const postHandlers: Array<IExecutorHandler<T>> = [];
+    const next: IExecutorHandlersCollection<T> | undefined = props.next;
+    const before: IExecutorHandlersCollection<T> | undefined = props.before;
 
     if (props.handlers) {
       for (let i = 0; i < props.handlers.length; i++) {
@@ -36,6 +40,7 @@ export function useExecutor<T>(options: IUseExecutorOptions<T>): void {
         handlers.push(handler);
       }
     }
+
     if (props.postHandlers) {
       for (let i = 0; i < props.postHandlers.length; i++) {
         const handler: IExecutorHandler<T> = (data, contexts) => props.postHandlers?.[i](data, contexts);
@@ -44,13 +49,30 @@ export function useExecutor<T>(options: IUseExecutorOptions<T>): void {
       }
     }
 
+    if (props.next) {
+      executor.next(props.next);
+    }
+
+    if (props.before) {
+      executor.next(props.before);
+    }
+
     return () => {
       for (const handler of handlers) {
         executor.removeHandler(handler);
       }
+
       for (const handler of postHandlers) {
         executor.removePostHandler(handler);
       }
+
+      if (next) {
+        executor.removeNext(next);
+      }
+
+      if (before) {
+        executor.removeBefore(before);
+      }
     };
   }, [executor, props.handlers?.length, props.postHandlers?.length]);
 }
diff --git a/webapp/packages/core-blocks/src/useFocus.ts b/webapp/packages/core-blocks/src/useFocus.ts
index 418e7fdbd4..dc3c7a2c26 100644
--- a/webapp/packages/core-blocks/src/useFocus.ts
+++ b/webapp/packages/core-blocks/src/useFocus.ts
@@ -6,7 +6,7 @@
  * you may not use this file except in compliance with the License.
  */
 import { action, observable } from 'mobx';
-import { useEffect } from 'react';
+import { useLayoutEffect } from 'react';
 
 import { useObjectRef } from './useObjectRef';
 import { useObservableRef } from './useObservableRef';
@@ -106,9 +106,8 @@ export function useFocus<T extends HTMLElement>({ autofocus, focusFirstChild, on
     'useFocus',
   );
 
-  useEffect(() => {
-    const reference = state.reference;
-
+  const reference = state.reference;
+  useLayoutEffect(() => {
     if (!reference) {
       return;
     }
@@ -138,9 +137,11 @@ export function useFocus<T extends HTMLElement>({ autofocus, focusFirstChild, on
       reference.removeEventListener('focusin', focusHandler);
       reference.removeEventListener('focusout', blurHandler);
     };
-  }, [state.reference]);
+    // TODO: probably we need to create a PR to https://github.com/facebook/react/blob/main/packages/eslint-plugin-react-hooks for custom stable hooks
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [reference]);
 
-  useEffect(
+  useLayoutEffect(
     () => () => {
       state.restoreFocus();
     },
diff --git a/webapp/packages/core-blocks/src/useS.ts b/webapp/packages/core-blocks/src/useS.ts
index 3ee0b1f6ea..709c41f058 100644
--- a/webapp/packages/core-blocks/src/useS.ts
+++ b/webapp/packages/core-blocks/src/useS.ts
@@ -49,7 +49,7 @@ export function useS<T extends ComponentStyle[]>(...componentStyles: [...T]): Ex
   const themeService = useService(ThemeService);
   const [currentThemeId, setCurrentThemeId] = useState(() => themeService.currentThemeId);
   const lastThemeRef = useRef<string>(currentThemeId);
-  //@ts-ignore
+  // @ts-ignore
   const filteredStyles = themeService.mapStyles(componentStyles.flat(Infinity).filter(Boolean) as Style[], context);
   const trackTheme = filteredStyles.some(style => typeof style === 'function');
 
diff --git a/webapp/packages/core-blocks/src/useStyles.ts b/webapp/packages/core-blocks/src/useStyles.ts
index b315bf0eec..124df33717 100644
--- a/webapp/packages/core-blocks/src/useStyles.ts
+++ b/webapp/packages/core-blocks/src/useStyles.ts
@@ -20,6 +20,7 @@ const stylesCache = new MetadataMap<string, Map<ThemeSelector<any>, Promise<unde
  * Changes styles depending on theme
  *
  * @param componentStyles styles array
+ * @deprecated use useS and css-modules instead
  */
 export function useStyles(...componentStyles: ComponentStyle[]): Record<string, any> {
   // todo do you understand that we store ALL STYLES in each component that uses this hook?
diff --git a/webapp/packages/core-cli/global.d.ts b/webapp/packages/core-cli/global.d.ts
index b8bda413b0..1c52c2531e 100644
--- a/webapp/packages/core-cli/global.d.ts
+++ b/webapp/packages/core-cli/global.d.ts
@@ -46,16 +46,36 @@ declare module 'reshadow' {
   declare function taggedStyled(strs: TemplateStringsArray, ...values: any[]): IdFunction;
   declare function taggedStyled<A extends JSX.Element>(node: A): A;
 
+  /**
+   *
+   * @deprecated use css-modules instead
+   */
   declare function styled(...styles: StylesMap[]): typeof taggedStyled;
+  /**
+   *
+   * @deprecated use css-modules instead
+   */
   declare function styled(strs: TemplateStringsArray, ...values: any[]): IdFunction;
 
+  /**
+   *
+   * @deprecated use css-modules instead
+   */
   export declare var use: ((value: StylesMap) => {}) & {
     [key: string]: typeof Component;
   };
 
+  /**
+   *
+   * @deprecated use css-modules instead
+   */
   export declare function css(strs: TemplateStringsArray, ...values: any[]): StylesMap;
   export declare function keyframes(strs: TemplateStringsArray, ...values: any[]): string;
 
+  /**
+   *
+   * @deprecated use css-modules instead
+   */
   export declare function create(styles: StylesMap[]): StylesMap;
 
   declare var jsx: typeof createElement;
diff --git a/webapp/packages/core-di/src/Bootstrap.ts b/webapp/packages/core-di/src/Bootstrap.ts
index 92376d49e1..64a799726e 100644
--- a/webapp/packages/core-di/src/Bootstrap.ts
+++ b/webapp/packages/core-di/src/Bootstrap.ts
@@ -9,6 +9,6 @@ import { injectable } from './injectable';
 
 @injectable()
 export abstract class Bootstrap {
-  abstract register(): void | Promise<void>;
-  abstract load(): void | Promise<void>;
+  register(): void | Promise<void> {}
+  load(): void | Promise<void> {}
 }
diff --git a/webapp/packages/core-dialogs/src/CommonDialog/RenameDialog.tsx b/webapp/packages/core-dialogs/src/CommonDialog/RenameDialog.tsx
index ab2b931eff..0a9bafeb86 100644
--- a/webapp/packages/core-dialogs/src/CommonDialog/RenameDialog.tsx
+++ b/webapp/packages/core-dialogs/src/CommonDialog/RenameDialog.tsx
@@ -9,7 +9,7 @@ import { observable } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import { useEffect } from 'react';
 
-import { Button, Container, Fill, InputField, s, SubmittingForm, useFocus, useObservableRef, useS, useTranslate } from '@cloudbeaver/core-blocks';
+import { Button, Container, Fill, Form, InputField, s, useFocus, useObservableRef, useS, useTranslate } from '@cloudbeaver/core-blocks';
 import { throttleAsync } from '@cloudbeaver/core-utils';
 
 import { CommonDialogBody } from './CommonDialog/CommonDialogBody';
@@ -97,13 +97,13 @@ export const RenameDialog: DialogComponent<RenameDialogPayload, string> = observ
     <CommonDialogWrapper size="small" className={className} fixedWidth>
       <CommonDialogHeader title={title} subTitle={subTitle} icon={icon} viewBox={viewBox} bigIcon={bigIcon} onReject={rejectDialog} />
       <CommonDialogBody>
-        <SubmittingForm ref={focusedRef} onSubmit={() => resolveDialog(state.value)}>
+        <Form ref={focusedRef} onSubmit={() => resolveDialog(state.value)}>
           <Container center>
             <InputField name="value" state={state} error={!state.valid} description={errorMessage} onChange={() => state.validate()}>
               {translate('ui_name') + ':'}
             </InputField>
           </Container>
-        </SubmittingForm>
+        </Form>
       </CommonDialogBody>
       <CommonDialogFooter className={s(styles, { footer: true })}>
         <Button type="button" mod={['outlined']} onClick={rejectDialog}>
diff --git a/webapp/packages/core-executor/src/ExecutorHandlersCollection.ts b/webapp/packages/core-executor/src/ExecutorHandlersCollection.ts
index 6ec3b178b0..f2d71d2893 100644
--- a/webapp/packages/core-executor/src/ExecutorHandlersCollection.ts
+++ b/webapp/packages/core-executor/src/ExecutorHandlersCollection.ts
@@ -82,6 +82,10 @@ export class ExecutorHandlersCollection<T = unknown, TResult = any | Promise<any
     return this;
   }
 
+  removeBefore(executor: IExecutorHandlersCollection<any, TResult>): void {
+    this.chain = this.chain.filter(link => link.executor !== executor || link.type !== 'before');
+  }
+
   next<TNext>(executor: IExecutorHandlersCollection<TNext, TResult>, map?: ExecutorDataMap<T, TNext>, filter?: ExecutorDataFilter<T>): this {
     this.chain.push({
       executor,
@@ -92,6 +96,10 @@ export class ExecutorHandlersCollection<T = unknown, TResult = any | Promise<any
     return this;
   }
 
+  removeNext(executor: IExecutorHandlersCollection<any, TResult>): void {
+    this.chain = this.chain.filter(link => link.executor !== executor || link.type !== 'next');
+  }
+
   hasHandler(handler: IExecutorHandler<T, TResult>): boolean {
     return this.handlers.includes(handler);
   }
diff --git a/webapp/packages/core-executor/src/IExecutorHandlersCollection.ts b/webapp/packages/core-executor/src/IExecutorHandlersCollection.ts
index c993d5fb0d..48e100b35c 100644
--- a/webapp/packages/core-executor/src/IExecutorHandlersCollection.ts
+++ b/webapp/packages/core-executor/src/IExecutorHandlersCollection.ts
@@ -33,7 +33,9 @@ export interface IExecutorHandlersCollection<T = unknown, TResult = any | Promis
   addContextCreator<TContext>(context: IAsyncContextLoader<TContext, T>, creator: IAsyncContextLoader<TContext, T>): this;
 
   before: <TNext>(executor: IExecutorHandlersCollection<TNext, TResult>, map?: ExecutorDataMap<T, TNext>) => this;
+  removeBefore: (executor: IExecutorHandlersCollection<any, TResult>) => void;
   next: <TNext>(executor: IExecutorHandlersCollection<TNext, TResult>, map?: ExecutorDataMap<T, TNext>) => this;
+  removeNext: (executor: IExecutorHandlersCollection<any, TResult>) => void;
   addCollection: (collection: IExecutorHandlersCollection<T, TResult>) => this;
   hasHandler: (handler: IExecutorHandler<T, TResult>) => boolean;
   addHandler: (handler: IExecutorHandler<T, TResult>) => this;
diff --git a/webapp/packages/core-sdk/src/Resource/CachedDataResource.ts b/webapp/packages/core-sdk/src/Resource/CachedDataResource.ts
index 04096cc517..1fa138a271 100644
--- a/webapp/packages/core-sdk/src/Resource/CachedDataResource.ts
+++ b/webapp/packages/core-sdk/src/Resource/CachedDataResource.ts
@@ -17,9 +17,9 @@ export type CachedDataResourceGetter<TValue, TIncludes> = TValue extends null
   ? CachedResourceValueIncludes<TValue, TIncludes> | null
   : CachedResourceValueIncludes<TValue, TIncludes>;
 
-  /**
-   * CachedDataResource is a resource that stores data that has no identifiers.
-   */
+/**
+ * CachedDataResource is a resource that stores data that has no identifiers.
+ */
 export abstract class CachedDataResource<
   TData,
   TKey = void,
@@ -78,11 +78,11 @@ export function getCachedDataResourceLoaderState<TData, TKey = void, TContext ex
     isOutdated() {
       return resource.isOutdated(param);
     },
-    load() {
-      return resource.load(param, context);
+    async load() {
+      await resource.load(param, context);
     },
-    reload() {
-      return resource.refresh(param, context);
+    async reload() {
+      await resource.refresh(param, context);
     },
   };
 }
diff --git a/webapp/packages/core-sdk/src/Resource/CachedMapResource.ts b/webapp/packages/core-sdk/src/Resource/CachedMapResource.ts
index 07e87f5596..3c299ee812 100644
--- a/webapp/packages/core-sdk/src/Resource/CachedMapResource.ts
+++ b/webapp/packages/core-sdk/src/Resource/CachedMapResource.ts
@@ -267,32 +267,32 @@ export abstract class CachedMapResource<
 
 export function getCachedMapResourceLoaderState<TKey, TValue, TContext extends Record<string, any> = Record<string, never>>(
   resource: CachedMapResource<TKey, TValue, TContext>,
-  key: ResourceKey<TKey>,
-  includes?: CachedResourceIncludeArgs<TValue, TContext> | undefined,
+  getKey: () => ResourceKey<TKey>,
+  getIncludes?: () => CachedResourceIncludeArgs<TValue, TContext> | undefined,
   lazy?: boolean,
 ): ILoadableState {
   return {
     lazy,
     get exception() {
-      return resource.getException(key);
+      return resource.getException(getKey());
     },
     isLoading() {
-      return resource.isLoading(key);
+      return resource.isLoading(getKey());
     },
     isLoaded() {
-      return resource.isLoaded(key, includes);
+      return resource.isLoaded(getKey(), getIncludes?.());
     },
     isError() {
       return isContainsException(this.exception);
     },
     isOutdated() {
-      return resource.isOutdated(key);
+      return resource.isOutdated(getKey());
     },
-    load() {
-      return resource.load(key, includes);
+    async load() {
+      await resource.load(getKey(), getIncludes?.());
     },
-    reload() {
-      return resource.refresh(key, includes);
+    async reload() {
+      await resource.refresh(getKey(), getIncludes?.());
     },
   };
 }
diff --git a/webapp/packages/core-sdk/src/Resource/CachedTreeResource.ts b/webapp/packages/core-sdk/src/Resource/CachedTreeResource.ts
index 757e5dc4ab..c57eb4a6fa 100644
--- a/webapp/packages/core-sdk/src/Resource/CachedTreeResource.ts
+++ b/webapp/packages/core-sdk/src/Resource/CachedTreeResource.ts
@@ -474,11 +474,11 @@ export function getCachedTreeResourceLoaderState<TValue, TContext extends Record
     isOutdated() {
       return resource.isOutdated(key);
     },
-    load() {
-      return resource.load(key, includes);
+    async load() {
+      await resource.load(key, includes);
     },
-    reload() {
-      return resource.refresh(key, includes);
+    async reload() {
+      await resource.refresh(key, includes);
     },
   };
 }
diff --git a/webapp/packages/core-sdk/src/queries/session/serverConfig.gql b/webapp/packages/core-sdk/src/queries/session/serverConfig.gql
index 4cf9ee424c..da4ec7912d 100644
--- a/webapp/packages/core-sdk/src/queries/session/serverConfig.gql
+++ b/webapp/packages/core-sdk/src/queries/session/serverConfig.gql
@@ -7,6 +7,7 @@ query serverConfig {
     rootURI
     containerId
     defaultAuthRole
+    defaultUserTeam
     productConfiguration
     supportsCustomConnections
     supportsConnectionBrowser
diff --git a/webapp/packages/core-theming/src/ComponentStyle.ts b/webapp/packages/core-theming/src/ComponentStyle.ts
index bd2dee9ddc..10fe9102db 100644
--- a/webapp/packages/core-theming/src/ComponentStyle.ts
+++ b/webapp/packages/core-theming/src/ComponentStyle.ts
@@ -13,4 +13,7 @@ export type ThemeSelector<T extends Record<string, string> = Record<string, stri
 ) => Promise<undefined | BaseStyles<T> | BaseStyles<T>[]>;
 export type Style<T extends Record<string, string> = Record<string, string>> = BaseStyles<T> | ThemeSelector<T>;
 export type DynamicStyle<T extends Record<string, string> = Record<string, string>> = Style<T> | boolean | undefined;
+/**
+ * @deprecated use SContext and StyleRegistry instead
+ */
 export type ComponentStyle<T extends Record<string, string> = Record<string, string>> = DynamicStyle<T> | ComponentStyle<T>[];
diff --git a/webapp/packages/core-ui/src/Form/DATA_CONTEXT_FORM_STATE.ts b/webapp/packages/core-ui/src/Form/DATA_CONTEXT_FORM_STATE.ts
new file mode 100644
index 0000000000..9a3d7829d3
--- /dev/null
+++ b/webapp/packages/core-ui/src/Form/DATA_CONTEXT_FORM_STATE.ts
@@ -0,0 +1,12 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { createDataContext } from '@cloudbeaver/core-view';
+
+import type { IFormState } from './IFormState';
+
+export const DATA_CONTEXT_FORM_STATE = createDataContext<IFormState<any>>('Form State');
diff --git a/webapp/packages/core-ui/src/Form/FormBaseService.ts b/webapp/packages/core-ui/src/Form/FormBaseService.ts
new file mode 100644
index 0000000000..6ee77040d9
--- /dev/null
+++ b/webapp/packages/core-ui/src/Form/FormBaseService.ts
@@ -0,0 +1,87 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { PlaceholderContainer } from '@cloudbeaver/core-blocks';
+import { ENotificationType, NotificationService } from '@cloudbeaver/core-events';
+import { ExecutorHandlersCollection, ExecutorInterrupter, IExecutorHandler, type IExecutorHandlersCollection } from '@cloudbeaver/core-executor';
+import type { LocalizationService } from '@cloudbeaver/core-localization';
+
+import { TabsContainer } from '../Tabs/TabsContainer/TabsContainer';
+import { formStatusContext } from './formStatusContext';
+import { formValidationContext } from './formValidationContext';
+import type { IFormProps } from './IFormProps';
+import type { IFormState } from './IFormState';
+
+export class FormBaseService<TState, TProps extends IFormProps<TState> = IFormProps<TState>> {
+  readonly parts: TabsContainer<TProps>;
+  readonly actionsContainer: PlaceholderContainer<TProps>;
+
+  readonly onConfigure: IExecutorHandlersCollection<IFormState<TState>>;
+  readonly onFillDefaultConfig: IExecutorHandlersCollection<IFormState<TState>>;
+  readonly onPrepareConfig: IExecutorHandlersCollection<TState>;
+  readonly onValidate: IExecutorHandlersCollection<IFormState<TState>>;
+  readonly onSubmit: IExecutorHandlersCollection<IFormState<TState>>;
+  readonly onState: IExecutorHandlersCollection<TState>;
+
+  constructor(private readonly localizationService: LocalizationService, private readonly notificationService: NotificationService, name: string) {
+    this.parts = new TabsContainer(name);
+    this.actionsContainer = new PlaceholderContainer();
+    this.onConfigure = new ExecutorHandlersCollection();
+    this.onFillDefaultConfig = new ExecutorHandlersCollection();
+    this.onPrepareConfig = new ExecutorHandlersCollection();
+    this.onValidate = new ExecutorHandlersCollection();
+    this.onSubmit = new ExecutorHandlersCollection();
+    this.onState = new ExecutorHandlersCollection();
+
+    this.onSubmit.before(this.onPrepareConfig);
+    this.onState.before(this.onPrepareConfig);
+
+    this.onSubmit.addPostHandler(this.handleSubmittingStatus);
+    this.onValidate.addPostHandler(this.handleValidation);
+  }
+
+  private readonly handleSubmittingStatus: IExecutorHandler<IFormState<TState>> = (data, contexts) => {
+    const status = contexts.getContext(formStatusContext);
+
+    if (!status.saved) {
+      ExecutorInterrupter.interrupt(contexts);
+    }
+
+    if (status.messages.length > 0) {
+      // if (status.exception) {
+      //   this.notificationService.logException(status.exception, status.messages[0], status.messages.slice(1).join('\n'));
+      // } else {
+      //   this.notificationService.notify(
+      //     {
+      //       title: status.messages[0],
+      //       message: status.messages.slice(1).join('\n'),
+      //     },
+      //     status.saved ? ENotificationType.Success : ENotificationType.Error,
+      //   );
+      // }
+    }
+  };
+
+  private readonly handleValidation: IExecutorHandler<IFormState<TState>> = (data, contexts) => {
+    const validation = contexts.getContext(formValidationContext);
+
+    if (!validation.valid) {
+      ExecutorInterrupter.interrupt(contexts);
+    }
+
+    if (validation.messages.length > 0) {
+      const messages = validation.messages.map(message => this.localizationService.translate(message));
+      this.notificationService.notify(
+        {
+          title: 'core_ui_form_save_error',
+          message: messages.join('\n'),
+        },
+        validation.valid ? ENotificationType.Info : ENotificationType.Error,
+      );
+    }
+  };
+}
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/IUserProfileFormState.ts b/webapp/packages/core-ui/src/Form/FormMode.ts
similarity index 54%
rename from webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/IUserProfileFormState.ts
rename to webapp/packages/core-ui/src/Form/FormMode.ts
index a4fc1c74fa..b6a4af516f 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/IUserProfileFormState.ts
+++ b/webapp/packages/core-ui/src/Form/FormMode.ts
@@ -5,11 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-import type { IFormStateInfo } from '@cloudbeaver/core-blocks';
 
-export interface IUserProfileFormState {
-  info: IFormStateInfo;
-  validate: () => Promise<void>;
-
-  dispose: () => void;
+export enum FormMode {
+  Edit = 'edit',
+  Create = 'create',
 }
diff --git a/webapp/packages/core-ui/src/Form/FormPart.ts b/webapp/packages/core-ui/src/Form/FormPart.ts
new file mode 100644
index 0000000000..78d0418a6e
--- /dev/null
+++ b/webapp/packages/core-ui/src/Form/FormPart.ts
@@ -0,0 +1,140 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { action, makeObservable, observable, toJS } from 'mobx';
+
+import { executorHandlerFilter, type IExecutionContextProvider } from '@cloudbeaver/core-executor';
+import { isObjectsEqual } from '@cloudbeaver/core-utils';
+
+import type { IFormPart } from './IFormPart';
+import type { IFormState } from './IFormState';
+
+export abstract class FormPart<TPartState, TFormState = any> implements IFormPart<TPartState> {
+  state: TPartState;
+  initialState: TPartState;
+
+  exception: Error | null;
+  promise: Promise<any> | null;
+
+  protected loaded: boolean;
+  protected loading: boolean;
+
+  constructor(protected readonly formState: IFormState<TFormState>, initialState: TPartState) {
+    this.initialState = initialState;
+    this.state = toJS(this.initialState);
+
+    this.exception = null;
+    this.promise = null;
+
+    this.loaded = false;
+    this.loading = false;
+
+    this.formState.submitTask.addHandler(executorHandlerFilter(() => this.isLoaded(), this.save.bind(this)));
+    this.formState.configureTask.addHandler(executorHandlerFilter(() => this.isLoaded(), this.configure.bind(this)));
+    this.formState.validationTask.addHandler(executorHandlerFilter(() => this.isLoaded(), this.validate.bind(this)));
+
+    makeObservable<this, 'loaded' | 'loading' | 'setInitialState'>(this, {
+      initialState: observable,
+      state: observable,
+      exception: observable.ref,
+      promise: observable.ref,
+      loaded: observable,
+      loading: observable,
+      setInitialState: action,
+    });
+  }
+
+  isLoading(): boolean {
+    return this.loading;
+  }
+
+  isOutdated(): boolean {
+    return false;
+  }
+
+  isLoaded(): boolean {
+    return this.loaded;
+  }
+
+  isError(): boolean {
+    return this.exception !== null;
+  }
+
+  isChanged(): boolean {
+    if (!this.loaded || this.initialState === this.state) {
+      return false;
+    }
+
+    return !isObjectsEqual(this.initialState, this.state);
+  }
+
+  async save(): Promise<any> {
+    if (this.loading) {
+      return;
+    }
+    this.loading = true;
+
+    try {
+      await this.loader();
+
+      if (!this.isChanged()) {
+        return;
+      }
+
+      await this.saveChanges();
+
+      this.loaded = false;
+      this.exception = null;
+    } catch (exception: any) {
+      this.exception = exception;
+      throw exception;
+    } finally {
+      this.loading = false;
+    }
+  }
+
+  async load(): Promise<void> {
+    if (this.loading) {
+      return this.promise;
+    }
+
+    try {
+      this.loading = true;
+      this.promise = this.loader();
+
+      await this.promise;
+      this.loaded = true;
+      this.exception = null;
+    } catch (exception: any) {
+      this.exception = exception;
+    } finally {
+      this.promise = null;
+      this.loading = false;
+    }
+  }
+
+  async reload(): Promise<void> {
+    this.loaded = false;
+    await this.load();
+  }
+
+  protected setInitialState(initialState: TPartState) {
+    this.initialState = initialState;
+
+    if (this.isChanged()) {
+      return;
+    }
+
+    this.state = toJS(this.initialState);
+  }
+
+  protected configure(data: IFormState<TFormState>, contexts: IExecutionContextProvider<IFormState<TFormState>>): void | Promise<void> {}
+  protected validate(data: IFormState<TFormState>, contexts: IExecutionContextProvider<IFormState<TFormState>>): void | Promise<void> {}
+
+  protected abstract loader(): Promise<void>;
+  protected abstract saveChanges(): Promise<void>;
+}
diff --git a/webapp/packages/core-ui/src/Form/FormState.ts b/webapp/packages/core-ui/src/Form/FormState.ts
new file mode 100644
index 0000000000..7ccd7cc3f1
--- /dev/null
+++ b/webapp/packages/core-ui/src/Form/FormState.ts
@@ -0,0 +1,223 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { action, makeObservable, observable } from 'mobx';
+
+import type { App } from '@cloudbeaver/core-di';
+import type { ENotificationType } from '@cloudbeaver/core-events';
+import { Executor, IExecutionContextProvider, type IExecutor } from '@cloudbeaver/core-executor';
+import { isLoadableStateHasException, MetadataMap, uuid } from '@cloudbeaver/core-utils';
+import {
+  DATA_CONTEXT_LOADABLE_STATE,
+  dataContextAddDIProvider,
+  type IDataContext,
+  loadableStateContext,
+  TempDataContext,
+} from '@cloudbeaver/core-view';
+
+import { DATA_CONTEXT_FORM_STATE } from './DATA_CONTEXT_FORM_STATE';
+import type { FormBaseService } from './FormBaseService';
+import { FormMode } from './FormMode';
+import { formStateContext } from './formStateContext';
+import type { IFormState } from './IFormState';
+
+export class FormState<TState> implements IFormState<TState> {
+  mode: FormMode;
+  parts: MetadataMap<string, any>;
+  state: TState;
+  isDisabled: boolean;
+
+  statusMessage: string | string[] | null;
+  statusType: ENotificationType | null;
+  exception: Error | (Error | null)[] | null;
+
+  promise: Promise<any> | null;
+
+  readonly id: string;
+  readonly service: FormBaseService<TState, any>;
+  readonly dataContext: IDataContext;
+
+  readonly configureTask: IExecutor<IFormState<TState>>;
+  readonly formStateTask: IExecutor<TState>;
+  readonly fillDefaultConfigTask: IExecutor<IFormState<TState>>;
+  readonly submitTask: IExecutor<IFormState<TState>>;
+  readonly validationTask: IExecutor<IFormState<TState>>;
+
+  constructor(app: App, service: FormBaseService<TState, any>, state: TState) {
+    this.id = uuid();
+    this.service = service;
+    this.dataContext = new TempDataContext();
+
+    this.mode = FormMode.Create;
+    this.parts = new MetadataMap<string, any>();
+    this.state = state;
+    this.isDisabled = false;
+
+    this.statusMessage = null;
+    this.statusType = null;
+    this.exception = null;
+
+    this.promise = null;
+
+    this.configureTask = new Executor(this as IFormState<TState>, () => true);
+    this.configureTask.addCollection(service.onConfigure);
+
+    this.formStateTask = new Executor<TState>(state, () => true);
+    this.formStateTask.addCollection(service.onState).addPostHandler(this.updateFormState.bind(this));
+
+    this.fillDefaultConfigTask = new Executor(this as IFormState<TState>, () => true);
+    this.fillDefaultConfigTask.addCollection(service.onFillDefaultConfig).next(this.formStateTask, form => form.state);
+
+    this.validationTask = new Executor(this as IFormState<TState>, () => true);
+    this.validationTask.addCollection(service.onValidate);
+
+    this.submitTask = new Executor(this as IFormState<TState>, () => true);
+    this.submitTask.addCollection(service.onSubmit).before(this.validationTask);
+
+    this.dataContext.set(DATA_CONTEXT_LOADABLE_STATE, loadableStateContext());
+    this.dataContext.set(DATA_CONTEXT_FORM_STATE, this);
+    dataContextAddDIProvider(this.dataContext, app);
+
+    makeObservable<this>(this, {
+      mode: observable,
+      parts: observable.ref,
+      promise: observable.ref,
+      exception: observable.ref,
+      isDisabled: observable.ref,
+      state: observable,
+      setMode: action,
+      setPartsState: action,
+      setException: action,
+      setState: action,
+    });
+  }
+
+  isLoading(): boolean {
+    return this.dataContext.get(DATA_CONTEXT_LOADABLE_STATE).loaders.some(loader => loader.isLoading());
+  }
+
+  isLoaded(): boolean {
+    if (this.promise) {
+      return false;
+    }
+    return this.dataContext.get(DATA_CONTEXT_LOADABLE_STATE).loaders.every(loader => loader.isLoaded());
+  }
+
+  isError(): boolean {
+    return this.dataContext.get(DATA_CONTEXT_LOADABLE_STATE).loaders.some(loader => loader.isError());
+  }
+
+  isOutdated(): boolean {
+    return this.dataContext.get(DATA_CONTEXT_LOADABLE_STATE).loaders.some(loader => loader.isOutdated?.() === true);
+  }
+
+  isCancelled(): boolean {
+    return this.dataContext.get(DATA_CONTEXT_LOADABLE_STATE).loaders.some(loader => loader.isCancelled?.() === true);
+  }
+
+  async load(refresh?: boolean): Promise<void> {
+    if (this.promise !== null) {
+      return this.promise;
+    }
+
+    if (this.isLoaded() && !this.isOutdated() && !refresh) {
+      return;
+    }
+
+    this.promise = (async () => {
+      try {
+        this.isDisabled = true;
+        await this.configureTask.execute(this);
+
+        const loaders = this.dataContext.get(DATA_CONTEXT_LOADABLE_STATE).loaders;
+
+        for (const loader of loaders) {
+          if (isLoadableStateHasException(loader)) {
+            continue;
+          }
+
+          if (!loader.isLoaded() || loader.isOutdated?.() === true) {
+            try {
+              await loader.load();
+            } catch {
+              return;
+            }
+          }
+        }
+
+        await this.fillDefaultConfigTask.execute(this);
+        this.exception = null;
+      } catch (exception: any) {
+        this.exception = exception;
+        throw exception;
+      } finally {
+        this.isDisabled = false;
+        this.promise = null;
+      }
+    })();
+  }
+
+  async reload(): Promise<void> {
+    await this.load(true);
+  }
+
+  cancel(): void {
+    const loaders = this.dataContext.get(DATA_CONTEXT_LOADABLE_STATE).loaders;
+
+    for (const loader of loaders) {
+      if (loader.isCancelled?.() !== true) {
+        loader.cancel?.();
+      }
+    }
+  }
+
+  setMode(mode: FormMode): this {
+    this.mode = mode;
+    return this;
+  }
+
+  setPartsState(state: MetadataMap<string, any>): this {
+    this.parts = state;
+    return this;
+  }
+
+  setException(exception: Error | (Error | null)[] | null): this {
+    this.exception = exception;
+    return this;
+  }
+
+  setState(state: TState): this {
+    this.state = state;
+    return this;
+  }
+
+  async save(): Promise<boolean> {
+    try {
+      this.isDisabled = true;
+      await this.submitTask.execute(this);
+
+      this.exception = null;
+      return true;
+    } catch (exception: any) {
+      this.exception = exception;
+    } finally {
+      this.isDisabled = false;
+    }
+    return false;
+  }
+
+  private updateFormState(data: TState, contexts: IExecutionContextProvider<TState>): void {
+    const context = contexts.getContext(formStateContext);
+
+    if (this.mode === FormMode.Create) {
+      context.markEdited();
+    }
+
+    this.statusMessage = context.statusMessage;
+    this.statusType = context.statusType;
+  }
+}
diff --git a/webapp/packages/core-ui/src/Form/IFormPart.ts b/webapp/packages/core-ui/src/Form/IFormPart.ts
new file mode 100644
index 0000000000..76abbb8c92
--- /dev/null
+++ b/webapp/packages/core-ui/src/Form/IFormPart.ts
@@ -0,0 +1,18 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { ILoadableState } from '@cloudbeaver/core-utils';
+
+export interface IFormPart<TState> extends ILoadableState {
+  state: TState;
+  initialState: TState;
+
+  isChanged(): boolean;
+
+  load(): Promise<void>;
+  save(): Promise<void>;
+}
diff --git a/webapp/packages/core-ui/src/Form/IFormProps.ts b/webapp/packages/core-ui/src/Form/IFormProps.ts
new file mode 100644
index 0000000000..5ab6db51d7
--- /dev/null
+++ b/webapp/packages/core-ui/src/Form/IFormProps.ts
@@ -0,0 +1,12 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { IFormState } from './IFormState';
+
+export interface IFormProps<TState> {
+  readonly formState: IFormState<TState>;
+}
diff --git a/webapp/packages/core-ui/src/Form/IFormState.ts b/webapp/packages/core-ui/src/Form/IFormState.ts
new file mode 100644
index 0000000000..63a79720ee
--- /dev/null
+++ b/webapp/packages/core-ui/src/Form/IFormState.ts
@@ -0,0 +1,53 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { ENotificationType } from '@cloudbeaver/core-events';
+import type { IExecutor } from '@cloudbeaver/core-executor';
+import type { ILoadableState, MetadataMap } from '@cloudbeaver/core-utils';
+import type { IDataContext } from '@cloudbeaver/core-view';
+
+import type { FormBaseService } from './FormBaseService';
+import type { FormMode } from './FormMode';
+
+export interface IFormState<TState> extends ILoadableState {
+  readonly id: string;
+  readonly service: FormBaseService<TState>;
+  readonly dataContext: IDataContext;
+
+  readonly mode: FormMode;
+  readonly parts: MetadataMap<string, any>;
+  readonly state: TState;
+  readonly isDisabled: boolean;
+
+  readonly promise: Promise<any> | null;
+
+  readonly exception: Error | (Error | null)[] | null;
+  readonly statusMessage: string | string[] | null;
+  readonly statusType: ENotificationType | null;
+
+  readonly configureTask: IExecutor<IFormState<TState>>;
+  readonly formStateTask: IExecutor<TState>;
+  readonly fillDefaultConfigTask: IExecutor<IFormState<TState>>;
+  readonly submitTask: IExecutor<IFormState<TState>>;
+  readonly validationTask: IExecutor<IFormState<TState>>;
+
+  setMode(mode: FormMode): this;
+  setPartsState(state: MetadataMap<string, any>): this;
+  setException(exception: Error | (Error | null)[] | null): this;
+  setState(state: TState): this;
+
+  isLoading(): boolean;
+  isLoaded(): boolean;
+  isError(): boolean;
+  isOutdated(): boolean;
+  isCancelled(): boolean;
+
+  load(): Promise<void>;
+  reload(): Promise<void>;
+  save(): Promise<boolean>;
+  cancel(): void;
+}
diff --git a/webapp/packages/core-ui/src/Form/IFormStateInfo.ts b/webapp/packages/core-ui/src/Form/IFormStateInfo.ts
new file mode 100644
index 0000000000..adf0add0fd
--- /dev/null
+++ b/webapp/packages/core-ui/src/Form/IFormStateInfo.ts
@@ -0,0 +1,16 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { ENotificationType } from '@cloudbeaver/core-events';
+
+export interface IFormStateInfo {
+  edited: boolean;
+  disabled: boolean;
+  readonly: boolean;
+  statusMessage: string | string[] | null;
+  statusType: ENotificationType | null;
+}
diff --git a/webapp/packages/core-ui/src/Form/formStateContext.ts b/webapp/packages/core-ui/src/Form/formStateContext.ts
new file mode 100644
index 0000000000..610cb97062
--- /dev/null
+++ b/webapp/packages/core-ui/src/Form/formStateContext.ts
@@ -0,0 +1,55 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { ENotificationType } from '@cloudbeaver/core-events';
+
+import type { IFormStateInfo } from './IFormStateInfo';
+
+export interface IFormStateContext extends IFormStateInfo {
+  markEdited: () => void;
+  setInfo(message: string): void;
+  setError(message: string): void;
+  setSuccess(message: string): void;
+  setLoading(message: string): void;
+  setMessage(message: string, type: ENotificationType): void;
+}
+
+export function formStateContext(): IFormStateContext {
+  return {
+    edited: false,
+    disabled: false,
+    readonly: false,
+    statusMessage: null,
+    statusType: null,
+    markEdited() {
+      this.edited = true;
+    },
+    setInfo(message) {
+      this.setMessage(message, ENotificationType.Info);
+    },
+    setError(message) {
+      this.setMessage(message, ENotificationType.Error);
+    },
+    setSuccess(message) {
+      this.setMessage(message, ENotificationType.Success);
+    },
+    setLoading(message) {
+      this.setMessage(message, ENotificationType.Loading);
+    },
+    setMessage(message, type) {
+      if (typeof this.statusMessage === 'string') {
+        this.statusMessage = [this.statusMessage];
+      }
+      if (this.statusMessage === null) {
+        this.statusMessage = message;
+      } else {
+        this.statusMessage.push(message);
+      }
+      this.statusType = type;
+    },
+  };
+}
diff --git a/webapp/packages/core-ui/src/Form/formStatusContext.ts b/webapp/packages/core-ui/src/Form/formStatusContext.ts
new file mode 100644
index 0000000000..590ec2f148
--- /dev/null
+++ b/webapp/packages/core-ui/src/Form/formStatusContext.ts
@@ -0,0 +1,31 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 IFormStatusContext {
+  saved: boolean;
+  messages: string[];
+  exception: Error | null;
+  info: (message: string) => void;
+  error: (message: string, exception?: Error) => void;
+}
+
+export function formStatusContext(): IFormStatusContext {
+  return {
+    saved: true,
+    messages: [],
+    exception: null,
+    info(message: string) {
+      this.messages.push(message);
+    },
+    error(message: string, exception: Error | null = null) {
+      this.messages.push(message);
+      this.saved = false;
+      this.exception = exception;
+    },
+  };
+}
diff --git a/webapp/packages/core-ui/src/Form/formValidationContext.ts b/webapp/packages/core-ui/src/Form/formValidationContext.ts
new file mode 100644
index 0000000000..3891ec77f7
--- /dev/null
+++ b/webapp/packages/core-ui/src/Form/formValidationContext.ts
@@ -0,0 +1,28 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 IFormValidationContext {
+  valid: boolean;
+  messages: string[];
+  info: (message: string) => void;
+  error: (message: string) => void;
+}
+
+export function formValidationContext(): IFormValidationContext {
+  return {
+    valid: true,
+    messages: [],
+    info(message: string) {
+      this.messages.push(message);
+    },
+    error(message: string) {
+      this.messages.push(message);
+      this.valid = false;
+    },
+  };
+}
diff --git a/webapp/packages/core-ui/src/Tabs/DATA_CONTEXT_TABS_FORM_VALIDATION.ts b/webapp/packages/core-ui/src/Tabs/DATA_CONTEXT_TABS_FORM_VALIDATION.ts
new file mode 100644
index 0000000000..a58fa890a9
--- /dev/null
+++ b/webapp/packages/core-ui/src/Tabs/DATA_CONTEXT_TABS_FORM_VALIDATION.ts
@@ -0,0 +1,10 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { createDataContext } from '@cloudbeaver/core-view';
+
+export const DATA_CONTEXT_TABS_FORM_VALIDATION = createDataContext<string | null>('Tabs Form Validation', () => null);
diff --git a/webapp/packages/core-ui/src/Tabs/Tab/TabDefault.tsx b/webapp/packages/core-ui/src/Tabs/Tab/TabDefault.tsx
index 4b77468d74..3e71fddab4 100644
--- a/webapp/packages/core-ui/src/Tabs/Tab/TabDefault.tsx
+++ b/webapp/packages/core-ui/src/Tabs/Tab/TabDefault.tsx
@@ -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 { useMemo } from 'react';
+import { useContext, useMemo } from 'react';
 import styled from 'reshadow';
 
 import { Translate, useStyles } from '@cloudbeaver/core-blocks';
@@ -13,6 +13,7 @@ import type { ComponentStyle } from '@cloudbeaver/core-theming';
 
 import { TabContext } from '../TabContext';
 import type { ITabData } from '../TabsContainer/ITabsContainer';
+import { TabsContext } from '../TabsContext';
 import { Tab } from './Tab';
 import { TabIcon } from './TabIcon';
 import type { TabProps } from './TabProps';
@@ -42,8 +43,10 @@ export function TabDefault<T = Record<string, any>>({
   onClose,
   ...rest
 }: Props<T> & T): React.ReactElement | null {
+  const state = useContext(TabsContext);
   const styles = useStyles(style);
   const tabContext = useMemo(() => ({ tabId }), [tabId]);
+  const selected = state?.state.selectedId === tabId;
 
   if (component) {
     const TabComponent = component;
@@ -54,6 +57,7 @@ export function TabDefault<T = Record<string, any>>({
           className={className}
           {...(rest as unknown as T)}
           style={style}
+          selected={selected}
           disabled={disabled}
           onOpen={onOpen}
           onClose={onClose}
@@ -63,7 +67,7 @@ export function TabDefault<T = Record<string, any>>({
   }
 
   return styled(styles)(
-    <Tab tabId={tabId} className={className} style={style} disabled={disabled} onOpen={onOpen} onClose={onClose}>
+    <Tab tabId={tabId} className={className} style={style} selected={selected} disabled={disabled} onOpen={onOpen} onClose={onClose}>
       {icon && <TabIcon icon={icon} />}
       {name && (
         <TabTitle>
diff --git a/webapp/packages/core-ui/src/Tabs/Tab/TabProps.ts b/webapp/packages/core-ui/src/Tabs/Tab/TabProps.ts
index 2c3c0f0d6b..98c263e16e 100644
--- a/webapp/packages/core-ui/src/Tabs/Tab/TabProps.ts
+++ b/webapp/packages/core-ui/src/Tabs/Tab/TabProps.ts
@@ -16,6 +16,7 @@ export type TabProps = PropsWithChildren<{
   tabId: string;
   title?: string;
   menuContext?: IDataContext;
+  selected?: boolean;
   disabled?: boolean;
   className?: string;
   style?: ComponentStyle;
diff --git a/webapp/packages/core-ui/src/Tabs/Tab/useTab.ts b/webapp/packages/core-ui/src/Tabs/Tab/useTab.ts
index bde8926ac8..043da36ac6 100644
--- a/webapp/packages/core-ui/src/Tabs/Tab/useTab.ts
+++ b/webapp/packages/core-ui/src/Tabs/Tab/useTab.ts
@@ -11,18 +11,26 @@ import { useContext } from 'react';
 import { useExecutor, useObjectRef, useObservableRef } from '@cloudbeaver/core-blocks';
 import { EventContext, EventStopPropagationFlag } from '@cloudbeaver/core-events';
 
+import { TabContext } from '../TabContext';
 import type { ITabData } from '../TabsContainer/ITabsContainer';
 import { TabsContext } from '../TabsContext';
 
 export function useTab(
-  tabId: string,
+  tabId?: string,
   onOpen?: (tab: ITabData<any>) => Promise<void> | void,
   onClose?: (tab: ITabData<any>) => Promise<void> | void,
   onClick?: (tabId: string) => void,
 ) {
   const state = useContext(TabsContext);
+  const tabContext = useContext(TabContext);
   const refObject = useObjectRef({ onClick });
 
+  tabId = tabId || tabContext?.tabId;
+
+  if (tabId === undefined) {
+    throw new Error('Tab id not provided');
+  }
+
   if (!state) {
     throw new Error('TabsContext not provided');
   }
@@ -71,7 +79,7 @@ export function useTab(
       },
       handleClose(e: React.MouseEvent<HTMLDivElement>) {
         EventContext.set(e, EventStopPropagationFlag); // TODO: probably should use special flag
-        this.state.close(tabId);
+        this.state.close(this.tabId);
       },
     }),
     {
diff --git a/webapp/packages/core-ui/src/Tabs/TabList.tsx b/webapp/packages/core-ui/src/Tabs/TabList.tsx
index 33a7a1b713..cf28f13097 100644
--- a/webapp/packages/core-ui/src/Tabs/TabList.tsx
+++ b/webapp/packages/core-ui/src/Tabs/TabList.tsx
@@ -9,6 +9,7 @@ import { observer } from 'mobx-react-lite';
 import { useContext } from 'react';
 import { TabList as BaseTabList, TabListOptions, TabStateReturn } from 'reakit/Tab';
 
+import { useTranslate } from '@cloudbeaver/core-blocks';
 import type { ComponentStyle } from '@cloudbeaver/core-theming';
 
 import { generateTabElement } from './generateTabElement';
@@ -22,8 +23,9 @@ interface Props extends Omit<TabListOptions, keyof TabStateReturn> {
   className?: string;
 }
 
-export const TabList = observer<React.PropsWithChildren<Props>>(function TabList({ style, className, children, childrenFirst, ...props }) {
+export const TabList = observer<React.PropsWithChildren<Props>>(function TabList({ style, children, childrenFirst, ...props }) {
   const state = useContext(TabsContext);
+  const translate = useTranslate();
 
   if (!state) {
     throw new Error('Tabs context was not provided');
@@ -32,7 +34,7 @@ export const TabList = observer<React.PropsWithChildren<Props>>(function TabList
   if (state.container) {
     const displayed = state.container.getDisplayed(state.props);
     return (
-      <BaseTabList {...props} {...state.state} className={className} area-label={props['aria-label'] ?? state.container.areaLabel}>
+      <BaseTabList {...props} {...state.state} area-label={translate(props['aria-label'] ?? state.container.areaLabel)}>
         {childrenFirst && children}
         {displayed
           .map(
@@ -62,7 +64,7 @@ export const TabList = observer<React.PropsWithChildren<Props>>(function TabList
   }
 
   return (
-    <BaseTabList {...props} className={className} {...state.state}>
+    <BaseTabList {...props} {...state.state} area-label={translate(props['aria-label'])}>
       {children}
     </BaseTabList>
   );
diff --git a/webapp/packages/core-ui/src/Tabs/TabPanel.tsx b/webapp/packages/core-ui/src/Tabs/TabPanel.tsx
index 47a14528cc..4cb8d868f0 100644
--- a/webapp/packages/core-ui/src/Tabs/TabPanel.tsx
+++ b/webapp/packages/core-ui/src/Tabs/TabPanel.tsx
@@ -6,24 +6,55 @@
  * you may not use this file except in compliance with the License.
  */
 import { observer } from 'mobx-react-lite';
-import { useContext, useMemo } from 'react';
+import { useContext, useEffect, useMemo, useRef } from 'react';
 import { TabPanel as BaseTabPanel, TabStateReturn } from 'reakit/Tab';
 
-import { getComputed, Loader } from '@cloudbeaver/core-blocks';
+import { FormContext, getComputed, Loader } from '@cloudbeaver/core-blocks';
 
+import { DATA_CONTEXT_TABS_FORM_VALIDATION } from './DATA_CONTEXT_TABS_FORM_VALIDATION';
 import { TabContext } from './TabContext';
 import type { TabPanelProps } from './TabPanelProps';
 import { TabsContext } from './TabsContext';
 
 export const TabPanel: React.FC<TabPanelProps> = observer(function TabPanel({ tabId, children, className, lazy }) {
   const state = useContext(TabsContext);
+  const formContext = useContext(FormContext);
+  const panelRef = useRef<HTMLDivElement>(null);
 
   if (!state) {
     throw new Error('Tabs context was not provided');
   }
 
+  const validationTabId = state.context.get(DATA_CONTEXT_TABS_FORM_VALIDATION);
   const tabContext = useMemo(() => ({ tabId }), [tabId]);
-  const enabled = getComputed(() => (lazy || state.lazy) && state.state.selectedId !== tabId);
+  const selected = getComputed(() => state.state.selectedId === tabId);
+  const enabled = getComputed(() => (lazy || state.lazy) && !selected);
+
+  useEffect(() => {
+    if (formContext === null) {
+      return;
+    }
+
+    async function trackValidity(event: Event) {
+      if (selected || state?.context.get(DATA_CONTEXT_TABS_FORM_VALIDATION) !== null) {
+        return;
+      }
+      state?.context.set(DATA_CONTEXT_TABS_FORM_VALIDATION, tabId);
+      await state?.open(tabId);
+    }
+
+    panelRef.current?.addEventListener('invalid', trackValidity, true);
+    return () => {
+      panelRef.current?.removeEventListener('invalid', trackValidity, true);
+    };
+  });
+
+  useEffect(() => {
+    if (selected && validationTabId === tabId) {
+      formContext?.validate();
+      state?.context.set(DATA_CONTEXT_TABS_FORM_VALIDATION, null);
+    }
+  });
 
   if (enabled) {
     return null;
@@ -32,7 +63,7 @@ export const TabPanel: React.FC<TabPanelProps> = observer(function TabPanel({ ta
   if (typeof children === 'function') {
     return (
       <TabContext.Provider value={tabContext}>
-        <BaseTabPanel {...state.state} tabId={tabId} className={className}>
+        <BaseTabPanel ref={panelRef} {...state.state} tabId={tabId} className={className}>
           <Loader suspense>{(children as (state: TabStateReturn) => React.ReactNode)(state.state)}</Loader>
         </BaseTabPanel>
       </TabContext.Provider>
@@ -41,7 +72,7 @@ export const TabPanel: React.FC<TabPanelProps> = observer(function TabPanel({ ta
 
   return (
     <TabContext.Provider value={tabContext}>
-      <BaseTabPanel {...state.state} tabId={tabId} className={className}>
+      <BaseTabPanel ref={panelRef} {...state.state} tabId={tabId} className={className}>
         <Loader suspense>{children}</Loader>
       </BaseTabPanel>
     </TabContext.Provider>
diff --git a/webapp/packages/core-ui/src/Tabs/TabsContainer/ITabsContainer.ts b/webapp/packages/core-ui/src/Tabs/TabsContainer/ITabsContainer.ts
index f50d16774c..c94c1cdbe9 100644
--- a/webapp/packages/core-ui/src/Tabs/TabsContainer/ITabsContainer.ts
+++ b/webapp/packages/core-ui/src/Tabs/TabsContainer/ITabsContainer.ts
@@ -5,7 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-import type { MetadataMap, MetadataValueGetter } from '@cloudbeaver/core-utils';
+import type { ILoadableState, MetadataMap, MetadataValueGetter } from '@cloudbeaver/core-utils';
+import type { IDataContextProvider } from '@cloudbeaver/core-view';
 
 import type { TabProps } from '../Tab/TabProps';
 
@@ -15,7 +16,7 @@ export interface ITabData<T = void> {
 }
 
 export type TabContainerTabComponent<TProps = void> = React.FC<TabProps & TProps>;
-export type TabContainerPanelComponent<TProps = void> = React.FC<{ tabId: string } & TProps>;
+export type TabContainerPanelComponent<TProps = void> = React.FC<{ tabId: string; className?: string } & TProps>;
 
 export interface ITabInfoOptions<TProps = void, TOptions extends Record<string, any> = never> {
   key: string;
@@ -31,6 +32,7 @@ export interface ITabInfoOptions<TProps = void, TOptions extends Record<string,
   panel: () => TabContainerPanelComponent<TProps> | React.ExoticComponent;
 
   stateGetter?: (props: TProps) => MetadataValueGetter<string, any>;
+  getLoader?: (context: IDataContextProvider, props?: TProps) => ILoadableState[] | ILoadableState;
 
   isHidden?: (tabId: string, props?: TProps) => boolean;
   isDisabled?: (tabId: string, props?: TProps) => boolean;
@@ -49,6 +51,7 @@ export interface ITabsContainer<TProps = void, TOptions extends Record<string, a
   readonly selectedId: string | null;
   has: (tabId: string) => boolean;
   getTabInfo: (tabId: string) => ITabInfo<TProps, TOptions> | undefined;
+  getDisplayedTabInfo: (tabId: string, props?: TProps) => ITabInfo<TProps, TOptions> | undefined;
   getTabState: <T>(state: MetadataMap<string, any>, tabId: string, props: TProps, valueGetter?: MetadataValueGetter<string, T>) => T;
   getDisplayed: (props?: TProps) => Array<ITabInfo<TProps, TOptions>>;
   getIdList: (props?: TProps) => string[];
diff --git a/webapp/packages/core-ui/src/Tabs/TabsContainer/TabsContainer.ts b/webapp/packages/core-ui/src/Tabs/TabsContainer/TabsContainer.ts
index b7698e92eb..9dcaee770c 100644
--- a/webapp/packages/core-ui/src/Tabs/TabsContainer/TabsContainer.ts
+++ b/webapp/packages/core-ui/src/Tabs/TabsContainer/TabsContainer.ts
@@ -46,7 +46,7 @@ export class TabsContainer<TProps = void, TOptions extends Record<string, any> =
       return;
     }
 
-    const info = this.getTabInfo(tabId);
+    const info = this.getDisplayedTabInfo(tabId, props);
 
     if (!info) {
       return;
@@ -65,7 +65,7 @@ export class TabsContainer<TProps = void, TOptions extends Record<string, any> =
   }
 
   getTabState<T>(state: MetadataMap<string, any>, tabId: string, props: TProps, valueGetter?: MetadataValueGetter<string, T>): T {
-    const tabInfo = this.getTabInfo(tabId);
+    const tabInfo = this.getDisplayedTabInfo(tabId, props);
 
     return state.get(tabId, valueGetter || tabInfo?.stateGetter?.(props));
   }
@@ -74,6 +74,30 @@ export class TabsContainer<TProps = void, TOptions extends Record<string, any> =
     return this.tabInfoList.filter(tabInfo => !tabInfo.isHidden?.(tabInfo.key, props));
   }
 
+  getDisplayedTabInfo(tabId: string, props?: TProps): ITabInfo<TProps, TOptions> | undefined {
+    if (this.tabInfoMap.has(tabId)) {
+      return this.getTabInfo(tabId);
+    }
+
+    const displayed = this.getDisplayed(props);
+
+    for (const tabInfo of displayed) {
+      if (tabInfo.generator) {
+        const generated = tabInfo.generator(tabInfo.key, props);
+
+        if (generated.includes(tabId)) {
+          return tabInfo;
+        }
+      } else {
+        if (tabInfo.key === tabId) {
+          return tabInfo;
+        }
+      }
+    }
+
+    return undefined;
+  }
+
   getIdList(props?: TProps): string[] {
     return this.getDisplayed(props)
       .map(tabInfo => {
diff --git a/webapp/packages/core-ui/src/Tabs/TabsContext.ts b/webapp/packages/core-ui/src/Tabs/TabsContext.ts
index e9671097ee..fb0b6befce 100644
--- a/webapp/packages/core-ui/src/Tabs/TabsContext.ts
+++ b/webapp/packages/core-ui/src/Tabs/TabsContext.ts
@@ -10,6 +10,7 @@ import type { TabStateReturn } from 'reakit/Tab';
 
 import type { IExecutor } from '@cloudbeaver/core-executor';
 import type { MetadataMap, MetadataValueGetter } from '@cloudbeaver/core-utils';
+import type { IDataContext } from '@cloudbeaver/core-view';
 
 import type { ITabData, ITabInfo, ITabsContainer } from './TabsContainer/ITabsContainer';
 
@@ -26,6 +27,7 @@ export interface ITabsContext<T = Record<string, any>> {
   closable: boolean;
   tabList?: string[];
   enabledBaseActions?: boolean;
+  context: IDataContext;
   canClose: (tabId: string) => boolean;
   getTabInfo: (tabId: string) => ITabInfo<T> | undefined;
   getTabState: <T>(tabId: string, valueGetter?: MetadataValueGetter<string, T>) => T;
diff --git a/webapp/packages/core-ui/src/Tabs/TabsState.tsx b/webapp/packages/core-ui/src/Tabs/TabsState.tsx
index c00249f782..e21fe555e1 100644
--- a/webapp/packages/core-ui/src/Tabs/TabsState.tsx
+++ b/webapp/packages/core-ui/src/Tabs/TabsState.tsx
@@ -10,11 +10,12 @@ import { observer } from 'mobx-react-lite';
 import { useEffect, useMemo, useState } from 'react';
 import { useTabState } from 'reakit/Tab';
 
-import { useExecutor, useObjectRef, useObservableRef } from '@cloudbeaver/core-blocks';
+import { useAutoLoad, useExecutor, useObjectRef, useObservableRef } from '@cloudbeaver/core-blocks';
 import { Executor, ExecutorInterrupter } from '@cloudbeaver/core-executor';
-import { isNull, isUndefined, MetadataMap, MetadataValueGetter } from '@cloudbeaver/core-utils';
+import { isDefined, isNull, isUndefined, MetadataMap, MetadataValueGetter } from '@cloudbeaver/core-utils';
+import { useDataContext } from '@cloudbeaver/core-view';
 
-import type { ITabData, ITabsContainer } from './TabsContainer/ITabsContainer';
+import type { ITabData, ITabInfo, ITabsContainer } from './TabsContainer/ITabsContainer';
 import { ITabsContext, TabsContext } from './TabsContext';
 import type { TabDirection } from './TabsContext';
 
@@ -54,6 +55,7 @@ export const TabsState = observer(function TabsState<T = Record<string, any>>({
   canClose,
   ...rest
 }: Props<T>): React.ReactElement | null {
+  const context = useDataContext();
   const props = useMemo(() => rest as any as T, [...Object.values(rest)]);
   let displayed: string[] = [];
 
@@ -168,6 +170,7 @@ export const TabsState = observer(function TabsState<T = Record<string, any>>({
 
   const value = useObservableRef<ITabsContext<T>>(
     () => ({
+      context,
       canClose(tabId) {
         return (
           dynamic.canClose?.({
@@ -177,7 +180,7 @@ export const TabsState = observer(function TabsState<T = Record<string, any>>({
         );
       },
       getTabInfo(tabId: string) {
-        return dynamic.container?.getTabInfo(tabId);
+        return dynamic.container?.getDisplayedTabInfo(tabId, dynamic.props);
       },
       getTabState(tabId: string, valueGetter?: MetadataValueGetter<string, any>) {
         return dynamic.container?.getTabState(dynamic.tabsState, tabId, dynamic.props, valueGetter);
@@ -266,5 +269,29 @@ export const TabsState = observer(function TabsState<T = Record<string, any>>({
     },
   );
 
+  if (container) {
+    let currentTabInfo: ITabInfo<T, never> | undefined;
+
+    if (state.selectedId) {
+      currentTabInfo = value.getTabInfo(state.selectedId);
+    }
+
+    useAutoLoad(
+      TabsState,
+      container
+        .getDisplayed(props)
+        .map(tab => tab.getLoader?.(context, props))
+        .filter(isDefined)
+        .flat(),
+    );
+
+    useAutoLoad(
+      TabsState,
+      [currentTabInfo?.getLoader?.(context, props) || []].flat().filter(loader => loader.lazy),
+      true,
+      true,
+    );
+  }
+
   return <TabsContext.Provider value={value}>{children}</TabsContext.Provider>;
 });
diff --git a/webapp/packages/core-ui/src/index.ts b/webapp/packages/core-ui/src/index.ts
index 469214a670..748cdffefe 100644
--- a/webapp/packages/core-ui/src/index.ts
+++ b/webapp/packages/core-ui/src/index.ts
@@ -15,6 +15,19 @@ export * from './DragAndDrop/DNDProvider';
 export * from './DragAndDrop/useDNDBox';
 export * from './DragAndDrop/useDNDData';
 
+export * from './Form/DATA_CONTEXT_FORM_STATE';
+export * from './Form/FormBaseService';
+export * from './Form/FormMode';
+export * from './Form/FormState';
+export * from './Form/FormPart';
+export * from './Form/formStateContext';
+export * from './Form/formStatusContext';
+export * from './Form/formValidationContext';
+export * from './Form/IFormPart';
+export * from './Form/IFormProps';
+export * from './Form/IFormState';
+export * from './Form/IFormStateInfo';
+
 export * from './InlineEditor/InlineEditor';
 
 export * from './Screens/AppScreen/NavigationService';
diff --git a/webapp/packages/core-ui/src/locales/en.ts b/webapp/packages/core-ui/src/locales/en.ts
index d141a562d9..d8a33c5409 100644
--- a/webapp/packages/core-ui/src/locales/en.ts
+++ b/webapp/packages/core-ui/src/locales/en.ts
@@ -1 +1,4 @@
-export default [['core_ui_empty', 'Empty']];
+export default [
+  ['core_ui_empty', 'Empty'],
+  ['core_ui_form_save_error', 'Error occurred when saving the form'],
+];
diff --git a/webapp/packages/core-ui/src/locales/it.ts b/webapp/packages/core-ui/src/locales/it.ts
index d141a562d9..d8a33c5409 100644
--- a/webapp/packages/core-ui/src/locales/it.ts
+++ b/webapp/packages/core-ui/src/locales/it.ts
@@ -1 +1,4 @@
-export default [['core_ui_empty', 'Empty']];
+export default [
+  ['core_ui_empty', 'Empty'],
+  ['core_ui_form_save_error', 'Error occurred when saving the form'],
+];
diff --git a/webapp/packages/core-ui/src/locales/ru.ts b/webapp/packages/core-ui/src/locales/ru.ts
index d95f701cac..5bf3c48f13 100644
--- a/webapp/packages/core-ui/src/locales/ru.ts
+++ b/webapp/packages/core-ui/src/locales/ru.ts
@@ -1 +1,4 @@
-export default [['core_ui_empty', 'Пусто']];
+export default [
+  ['core_ui_empty', 'Пусто'],
+  ['core_ui_form_save_error', 'Ошибка при сохранении формы'],
+];
diff --git a/webapp/packages/core-utils/src/ILoadableState.ts b/webapp/packages/core-utils/src/ILoadableState.ts
index 2be565c47f..233edcce6c 100644
--- a/webapp/packages/core-utils/src/ILoadableState.ts
+++ b/webapp/packages/core-utils/src/ILoadableState.ts
@@ -12,9 +12,10 @@ export interface ILoadableState {
   isLoaded: () => boolean;
   isError: () => boolean;
   readonly exception?: (Error | null)[] | Error | null;
-  load: () => void;
-  reload?: () => void;
+  load: () => void | Promise<void>;
+  reload?: () => void | Promise<void>;
 
+  promise?: Promise<any> | null;
   isOutdated?: () => boolean;
   isCancelled?: () => boolean;
   cancel?: () => void;
@@ -35,3 +36,11 @@ export function isContainsException(exception?: (Error | null)[] | Error | null)
 
   return !!exception;
 }
+
+export function getFirstException(exception?: (Error | null)[] | Error | null): Error | null {
+  if (Array.isArray(exception)) {
+    return exception.find(Boolean) || null;
+  }
+
+  return exception || null;
+}
diff --git a/webapp/packages/core-view/src/Action/Actions/ACTION_CREATE.ts b/webapp/packages/core-view/src/Action/Actions/ACTION_CREATE.ts
new file mode 100644
index 0000000000..94e58a8805
--- /dev/null
+++ b/webapp/packages/core-view/src/Action/Actions/ACTION_CREATE.ts
@@ -0,0 +1,12 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { createAction } from '../createAction';
+
+export const ACTION_CREATE = createAction('create', {
+  label: 'core_view_action_create_label',
+});
diff --git a/webapp/packages/core-view/src/DataContext/DATA_CONTEXT_DI_PROVIDER.ts b/webapp/packages/core-view/src/DataContext/DATA_CONTEXT_DI_PROVIDER.ts
new file mode 100644
index 0000000000..0e588f2337
--- /dev/null
+++ b/webapp/packages/core-view/src/DataContext/DATA_CONTEXT_DI_PROVIDER.ts
@@ -0,0 +1,12 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { IServiceInjector } from '@cloudbeaver/core-di';
+
+import { createDataContext } from './createDataContext';
+
+export const DATA_CONTEXT_DI_PROVIDER = createDataContext<IServiceInjector>('DI Provider');
diff --git a/webapp/packages/core-view/src/DataContext/DataContext.ts b/webapp/packages/core-view/src/DataContext/DataContext.ts
index deb5ea5ebe..3a9e33805f 100644
--- a/webapp/packages/core-view/src/DataContext/DataContext.ts
+++ b/webapp/packages/core-view/src/DataContext/DataContext.ts
@@ -120,10 +120,11 @@ export class DataContext implements IDataContext {
   }
 
   get<T>(context: DataContextGetter<T>): T {
-    if (!this.map.has(context)) {
-      const defaultValue = context();
+    if (!this.hasOwn(context)) {
+      const defaultValue = context(this);
 
       if (defaultValue !== undefined) {
+        this.set(context, defaultValue);
         return defaultValue;
       }
 
diff --git a/webapp/packages/core-view/src/DataContext/DataContextGetter.ts b/webapp/packages/core-view/src/DataContext/DataContextGetter.ts
index 90ef882edb..e329491b6e 100644
--- a/webapp/packages/core-view/src/DataContext/DataContextGetter.ts
+++ b/webapp/packages/core-view/src/DataContext/DataContextGetter.ts
@@ -5,5 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
+import type { IDataContextProvider } from './IDataContextProvider';
 
-export type DataContextGetter<T> = () => T;
+export type DataContextGetter<T> = (provider: IDataContextProvider) => T;
diff --git a/webapp/packages/core-view/src/DataContext/TempDataContext.ts b/webapp/packages/core-view/src/DataContext/TempDataContext.ts
index 394ec85606..367d639423 100644
--- a/webapp/packages/core-view/src/DataContext/TempDataContext.ts
+++ b/webapp/packages/core-view/src/DataContext/TempDataContext.ts
@@ -132,9 +132,10 @@ export class TempDataContext implements IDataContext {
 
   get<T>(context: DataContextGetter<T>): T {
     if (!this.hasOwn(context)) {
-      const defaultValue = context();
+      const defaultValue = context(this);
 
       if (defaultValue !== undefined) {
+        this.set(context, defaultValue);
         return defaultValue;
       }
 
diff --git a/webapp/packages/core-view/src/DataContext/createDataContext.ts b/webapp/packages/core-view/src/DataContext/createDataContext.ts
index ca0a016ea5..ffa50fa89e 100644
--- a/webapp/packages/core-view/src/DataContext/createDataContext.ts
+++ b/webapp/packages/core-view/src/DataContext/createDataContext.ts
@@ -6,12 +6,16 @@
  * you may not use this file except in compliance with the License.
  */
 import type { DataContextGetter } from './DataContextGetter';
+import type { IDataContextProvider } from './IDataContextProvider';
 
-export function createDataContext<T>(name: string, defaultValue?: () => T extends any ? T : undefined): DataContextGetter<T> {
+export function createDataContext<T>(
+  name: string,
+  defaultValue?: (context: IDataContextProvider) => T extends any ? T : undefined,
+): DataContextGetter<T> {
   name = `@context/${name}`;
   const obj = {
-    [name](): T {
-      return defaultValue?.() as T;
+    [name](context: IDataContextProvider): T {
+      return defaultValue?.(context) as T;
     },
   };
   return obj[name];
diff --git a/webapp/packages/core-view/src/DataContext/dataContextAddDIProvider.ts b/webapp/packages/core-view/src/DataContext/dataContextAddDIProvider.ts
new file mode 100644
index 0000000000..cd398292bb
--- /dev/null
+++ b/webapp/packages/core-view/src/DataContext/dataContextAddDIProvider.ts
@@ -0,0 +1,16 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { App } from '@cloudbeaver/core-di';
+
+import { DATA_CONTEXT_DI_PROVIDER } from './DATA_CONTEXT_DI_PROVIDER';
+import type { IDataContext } from './IDataContext';
+
+export function dataContextAddDIProvider(context: IDataContext, app: App): IDataContext {
+  context.set(DATA_CONTEXT_DI_PROVIDER, app.getServiceInjector());
+  return context;
+}
diff --git a/webapp/packages/core-view/src/LoadableStateContext/DATA_CONTEXT_LOADABLE_STATE.ts b/webapp/packages/core-view/src/LoadableStateContext/DATA_CONTEXT_LOADABLE_STATE.ts
index 7e56d5eb91..d0678c7a3d 100644
--- a/webapp/packages/core-view/src/LoadableStateContext/DATA_CONTEXT_LOADABLE_STATE.ts
+++ b/webapp/packages/core-view/src/LoadableStateContext/DATA_CONTEXT_LOADABLE_STATE.ts
@@ -5,18 +5,25 @@
  * 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 { flat, ILoadableState } from '@cloudbeaver/core-utils';
 
 import { createDataContext } from '../DataContext/createDataContext';
 
 interface ILoadableStateContext {
+  readonly loaders: ILoadableState[];
   getState(id: string, defaultState: () => ILoadableState | ILoadableState[]): ILoadableState[];
+  removeState(id: string): void;
 }
 
 export function loadableStateContext(): ILoadableStateContext {
-  const state = new Map<string, ILoadableState[]>();
+  const state = observable(new Map<string, ILoadableState[]>(), { deep: false });
 
   return {
+    get loaders(): ILoadableState[] {
+      return flat([...state.values()]);
+    },
     getState(id, defaultState) {
       if (!state.has(id)) {
         state.set(id, flat([defaultState()]));
@@ -24,6 +31,9 @@ export function loadableStateContext(): ILoadableStateContext {
 
       return state.get(id)!;
     },
+    removeState(id) {
+      state.delete(id);
+    },
   };
 }
 
diff --git a/webapp/packages/core-view/src/Menu/useMenuContext.ts b/webapp/packages/core-view/src/Menu/useMenuContext.ts
index 17bce8a0cc..1d656f6593 100644
--- a/webapp/packages/core-view/src/Menu/useMenuContext.ts
+++ b/webapp/packages/core-view/src/Menu/useMenuContext.ts
@@ -20,7 +20,7 @@ export function useMenuContext(menu: IMenu, _menuContext?: IDataContext): IDataC
 
   context.set(DATA_CONTEXT_MENU, menu);
 
-  if (context.has(DATA_CONTEXT_LOADABLE_STATE, false)) {
+  if (!context.has(DATA_CONTEXT_LOADABLE_STATE, false)) {
     context.set(DATA_CONTEXT_LOADABLE_STATE, loadableStateContext());
   }
 
diff --git a/webapp/packages/core-view/src/index.ts b/webapp/packages/core-view/src/index.ts
index c0af039136..88acec5833 100644
--- a/webapp/packages/core-view/src/index.ts
+++ b/webapp/packages/core-view/src/index.ts
@@ -1,4 +1,5 @@
 export * from './Action/Actions/ACTION_COLLAPSE_ALL';
+export * from './Action/Actions/ACTION_CREATE';
 export * from './Action/Actions/ACTION_DELETE';
 export * from './Action/Actions/ACTION_EDIT';
 export * from './Action/Actions/ACTION_EXPORT';
@@ -31,7 +32,9 @@ export * from './Action/KeyBinding/IKeyBinding';
 export * from './Action/KeyBinding/getCommonAndOSSpecificKeys';
 export * from './Action/KeyBinding/getBindingLabel';
 export * from './DataContext/createDataContext';
+export * from './DataContext/DATA_CONTEXT_DI_PROVIDER';
 export * from './DataContext/DataContext';
+export * from './DataContext/dataContextAddDIProvider';
 export * from './DataContext/DynamicDataContext';
 export * from './DataContext/IDataContext';
 export * from './DataContext/IDataContextProvider';
diff --git a/webapp/packages/core-view/src/locales/en.ts b/webapp/packages/core-view/src/locales/en.ts
index 3a192c4ae1..67a5a91154 100644
--- a/webapp/packages/core-view/src/locales/en.ts
+++ b/webapp/packages/core-view/src/locales/en.ts
@@ -2,6 +2,7 @@ export default [
   ['core_view_layout', 'Layout'],
   ['core_view_zoom_in', 'Zoom In'],
   ['core_view_zoom_out', 'Zoom out'],
+  ['core_view_action_create_label', 'Create'],
   ['core_view_action_new_folder', 'New folder'],
   ['core_view_action_edit_label', 'Edit'],
 ];
diff --git a/webapp/packages/core-view/src/locales/it.ts b/webapp/packages/core-view/src/locales/it.ts
index 3a192c4ae1..67a5a91154 100644
--- a/webapp/packages/core-view/src/locales/it.ts
+++ b/webapp/packages/core-view/src/locales/it.ts
@@ -2,6 +2,7 @@ export default [
   ['core_view_layout', 'Layout'],
   ['core_view_zoom_in', 'Zoom In'],
   ['core_view_zoom_out', 'Zoom out'],
+  ['core_view_action_create_label', 'Create'],
   ['core_view_action_new_folder', 'New folder'],
   ['core_view_action_edit_label', 'Edit'],
 ];
diff --git a/webapp/packages/core-view/src/locales/ru.ts b/webapp/packages/core-view/src/locales/ru.ts
index 197566c821..ac78cd1445 100644
--- a/webapp/packages/core-view/src/locales/ru.ts
+++ b/webapp/packages/core-view/src/locales/ru.ts
@@ -2,6 +2,7 @@ export default [
   ['core_view_layout', 'Упорядочить'],
   ['core_view_zoom_in', 'Приблизить'],
   ['core_view_zoom_out', 'Отдалить'],
+  ['core_view_action_create_label', 'Создать'],
   ['core_view_action_new_folder', 'Создать папку'],
   ['core_view_action_edit_label', 'Изменить'],
 ];
diff --git a/webapp/packages/eslint-config/eslint-config.json b/webapp/packages/eslint-config/eslint-config.json
index e1695e8a12..515b2529ad 100644
--- a/webapp/packages/eslint-config/eslint-config.json
+++ b/webapp/packages/eslint-config/eslint-config.json
@@ -59,7 +59,7 @@
     "@typescript-eslint/ban-ts-comment": "off",
     "@typescript-eslint/no-for-in-array": "off",
     "@typescript-eslint/no-use-before-define": "off",
-    "@typescript-eslint/no-unused-vars": "warn",
+    "@typescript-eslint/no-unused-vars": ["warn", { "destructuredArrayIgnorePattern": "^_" }],
     "@typescript-eslint/no-non-null-assertion": "off",
     "@typescript-eslint/explicit-function-return-type": "off",
     "@typescript-eslint/no-empty-function": "off",
diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationPage.tsx b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationPage.tsx
index a263a8ec8a..e0f871b2f4 100644
--- a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationPage.tsx
+++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationPage.tsx
@@ -12,12 +12,12 @@ import { ADMINISTRATION_TOOLS_PANEL_STYLES, AdministrationItemContentComponent,
 import {
   ColoredContainer,
   Container,
+  Form,
   Group,
   GroupItem,
   GroupTitle,
   Loader,
   Placeholder,
-  SubmittingForm,
   ToolsAction,
   ToolsPanel,
   useFocus,
@@ -38,7 +38,7 @@ import { ServerConfigurationDriversForm } from './ServerConfigurationDriversForm
 import { ServerConfigurationService } from './ServerConfigurationService';
 
 const styles = css`
-  SubmittingForm {
+  Form {
     flex: 1;
     display: flex;
     overflow: auto;
@@ -97,7 +97,7 @@ export const ServerConfigurationPage: AdministrationItemContentComponent = obser
   }
 
   return styled(style)(
-    <SubmittingForm ref={focusedRef} name="server_config" onChange={handleChange}>
+    <Form ref={focusedRef} name="server_config" onChange={handleChange}>
       {!configurationWizard && (
         <ToolsPanel>
           <ToolsAction
@@ -153,6 +153,6 @@ export const ServerConfigurationPage: AdministrationItemContentComponent = obser
           }
         </Loader>
       </ColoredContainer>
-    </SubmittingForm>,
+    </Form>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/useConfigurationsTable.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/useConfigurationsTable.tsx
index 5754021a94..2c2515cac5 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/useConfigurationsTable.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/useConfigurationsTable.tsx
@@ -81,7 +81,7 @@ export function useConfigurationsTable(): Readonly<State> {
           await resource.deleteConfiguration(resourceKeyList(deletionList));
 
           this.tableState.unselect();
-          this.tableState.unexpand(deletionList);
+          this.tableState.collapse(deletionList);
         } catch (exception: any) {
           notificationService.logException(exception, 'Configurations delete failed');
         } finally {
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/Options/AuthConfigurationOptions.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/Options/AuthConfigurationOptions.tsx
index 36e3850d48..bd704fd784 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/Options/AuthConfigurationOptions.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/Options/AuthConfigurationOptions.tsx
@@ -14,12 +14,12 @@ import {
   ColoredContainer,
   Combobox,
   FieldCheckbox,
+  Form,
   Group,
   GroupTitle,
   InputField,
   Link,
   ObjectPropertyInfoForm,
-  SubmittingForm,
   Textarea,
   useClipboard,
   useObjectPropertyCategories,
@@ -33,7 +33,7 @@ import type { TabContainerPanelComponent } from '@cloudbeaver/core-ui';
 import type { IAuthConfigurationFormProps } from '../IAuthConfigurationFormProps';
 
 const styles = css`
-  SubmittingForm {
+  Form {
     flex: 1;
     overflow: auto;
   }
@@ -62,7 +62,7 @@ export const AuthConfigurationOptions: TabContainerPanelComponent<IAuthConfigura
   }, [state]);
 
   return styled(style)(
-    <SubmittingForm ref={formRef}>
+    <Form ref={formRef}>
       <ColoredContainer parent gap overflow>
         <Group small gap>
           <Combobox
@@ -178,6 +178,6 @@ export const AuthConfigurationOptions: TabContainerPanelComponent<IAuthConfigura
           </Group>
         )}
       </ColoredContainer>
-    </SubmittingForm>,
+    </Form>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/ServerConfiguration/AuthenticationProviders.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/ServerConfiguration/AuthenticationProviders.tsx
index e616bbf5e4..9769860358 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/ServerConfiguration/AuthenticationProviders.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/ServerConfiguration/AuthenticationProviders.tsx
@@ -51,7 +51,7 @@ export const AuthenticationProviders: PlaceholderComponent<IConfigurationPlaceho
   const isAnonymousAccessDisabled = authSettingsService.settings.getValue('disableAnonymousAccess');
 
   useExecutor({
-    executor: formContext.changeExecutor,
+    executor: formContext.onChange,
     handlers: [
       function switchControls() {
         if (serverConfig.enabledAuthProviders?.length === 0) {
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/ADMINISTRATION_ITEM_USER_CREATE_PARAM.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/ADMINISTRATION_ITEM_USER_CREATE_PARAM.ts
new file mode 100644
index 0000000000..c631c31fa7
--- /dev/null
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/ADMINISTRATION_ITEM_USER_CREATE_PARAM.ts
@@ -0,0 +1,9 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 ADMINISTRATION_ITEM_USER_CREATE_PARAM = 'create';
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/CreateMetaParameter.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/CreateMetaParameter.tsx
deleted file mode 100644
index ab6fb35074..0000000000
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/CreateMetaParameter.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2023 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 styled, { css } from 'reshadow';
-
-import { Translate } from '@cloudbeaver/core-blocks';
-import type { AdminUserInfo } from '@cloudbeaver/core-sdk';
-
-import { UserForm } from '../UserForm/UserForm';
-
-const styles = css`
-  user-create-footer,
-  user-create-content {
-    composes: theme-background-secondary theme-text-on-secondary from global;
-  }
-  user-create {
-    display: flex;
-    flex-direction: column;
-    height: 540px;
-    overflow: hidden;
-  }
-
-  title-bar {
-    composes: theme-border-color-background theme-typography--headline6 from global;
-    box-sizing: border-box;
-    padding: 16px 24px;
-    align-items: center;
-    display: flex;
-    font-weight: 400;
-    flex: auto 0 0;
-  }
-
-  user-create-content {
-    position: relative;
-    display: flex;
-    flex-direction: column;
-    flex: 1;
-    overflow: auto;
-  }
-`;
-
-interface Props {
-  user: AdminUserInfo;
-  onCancel: () => void;
-}
-
-export const CreateMetaParameter: React.FC<Props> = function CreateMetaParameter({ user, onCancel }) {
-  return styled(styles)(
-    <user-create>
-      <title-bar>
-        <Translate token="authentication_administration_user_connections_user_add" />
-      </title-bar>
-      <user-create-content>
-        <UserForm user={user} onCancel={onCancel} />
-      </user-create-content>
-    </user-create>,
-  );
-};
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/CreateMetaParameterService.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/CreateMetaParameterService.ts
deleted file mode 100644
index 8f02689a07..0000000000
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/CreateMetaParameterService.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2023 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 { makeObservable, observable } from 'mobx';
-
-import { UsersResource } from '@cloudbeaver/core-authentication';
-import { injectable } from '@cloudbeaver/core-di';
-import type { AdminUserInfo } from '@cloudbeaver/core-sdk';
-
-import { UsersAdministrationNavigationService } from '../UsersAdministrationNavigationService';
-
-@injectable()
-export class CreateMetaParameterService {
-  user: AdminUserInfo | null = null;
-
-  constructor(
-    private readonly usersAdministrationNavigationService: UsersAdministrationNavigationService,
-    private readonly usersResource: UsersResource,
-  ) {
-    makeObservable(this, {
-      user: observable,
-    });
-
-    this.user = null;
-
-    this.clearUserTemplate = this.clearUserTemplate.bind(this);
-    this.cancelCreate = this.cancelCreate.bind(this);
-    this.create = this.create.bind(this);
-  }
-
-  cancelCreate(): void {
-    this.clearUserTemplate();
-    this.usersAdministrationNavigationService.navToRoot();
-  }
-
-  create(): void {
-    if (this.user) {
-      return;
-    }
-
-    this.user = this.usersResource.getEmptyUser();
-    this.usersAdministrationNavigationService.navToCreate();
-  }
-
-  clearUserTemplate(): void {
-    this.user = null;
-  }
-
-  close(): void {
-    this.clearUserTemplate();
-  }
-}
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/MetaParameterForm.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/MetaParameterForm.tsx
deleted file mode 100644
index e9bd79c93e..0000000000
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/MetaParameterForm.tsx
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2023 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 styled, { css } from 'reshadow';
-
-import { IconOrImage, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
-import type { UserInfo } from '@cloudbeaver/core-sdk';
-import { BASE_TAB_STYLES, TabList, TabsState, UNDERLINE_TAB_BIG_STYLES, UNDERLINE_TAB_STYLES } from '@cloudbeaver/core-ui';
-
-import type { IUserProfileFormState } from './IUserProfileFormState';
-import { MetaParameterInfoPanel } from './UserInfo/MetaParameterInfoPanel';
-import { MetaParameterInfoTab } from './UserInfo/MetaParameterInfoTab';
-
-const tabsStyles = css`
-  TabList {
-    position: relative;
-    flex-shrink: 0;
-    align-items: center;
-  }
-`;
-
-const topBarStyles = css`
-  top-bar {
-    composes: theme-border-color-background theme-background-secondary theme-text-on-secondary from global;
-    position: relative;
-    display: flex;
-    padding-top: 16px;
-
-    &:before {
-      content: '';
-      position: absolute;
-      bottom: 0;
-      width: 100%;
-      border-bottom: solid 2px;
-      border-color: inherit;
-    }
-  }
-  top-bar-tabs {
-    flex: 1;
-  }
-
-  top-bar-actions {
-    display: flex;
-    align-items: center;
-    padding: 0 24px;
-    gap: 16px;
-  }
-
-  /*Button:not(:first-child) {
-      margin-right: 24px;
-    }*/
-
-  status-message {
-    composes: theme-typography--caption from global;
-    height: 24px;
-    padding: 0 16px;
-    display: flex;
-    align-items: center;
-    gap: 8px;
-
-    & IconOrImage {
-      height: 24px;
-      width: 24px;
-    }
-  }
-`;
-
-const formStyles = css`
-  box {
-    composes: theme-background-secondary theme-text-on-secondary from global;
-  }
-  flex-box {
-    display: flex;
-    flex-direction: column;
-    flex: 1;
-    height: 100%;
-    overflow: auto;
-  }
-  content-box {
-    composes: theme-background-secondary theme-border-color-background from global;
-    position: relative;
-    display: flex;
-    flex: 1;
-    flex-direction: column;
-    overflow: auto;
-  }
-`;
-
-interface Props {
-  user: UserInfo;
-  state: IUserProfileFormState;
-}
-
-export const MetaParameterForm = observer<Props>(function MetaParameterForm({ user, state }) {
-  const translate = useTranslate();
-  const style = [BASE_TAB_STYLES, tabsStyles, UNDERLINE_TAB_STYLES, UNDERLINE_TAB_BIG_STYLES];
-  const styles = useStyles(style, topBarStyles, formStyles);
-
-  return styled(styles)(
-    <flex-box>
-      <TabsState>
-        <top-bar>
-          <top-bar-tabs>
-            <status-message>
-              {state.info.statusMessage && (
-                <>
-                  <IconOrImage icon="/icons/info_icon.svg" />
-                  {translate(state.info.statusMessage)}
-                </>
-              )}
-            </status-message>
-            <TabList style={style} disabled={state.info.disabled}>
-              <MetaParameterInfoTab style={style} />
-              {/* <UserAuthProvidersTab style={style} /> */}
-            </TabList>
-          </top-bar-tabs>
-          <top-bar-actions> </top-bar-actions>
-        </top-bar>
-        <content-box>
-          <MetaParameterInfoPanel user={user} style={style} />
-          {/* <UserAuthProviderPanel user={user} style={style} /> */}
-        </content-box>
-      </TabsState>
-    </flex-box>,
-  );
-});
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoForm.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoForm.tsx
deleted file mode 100644
index 4d7e291a22..0000000000
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoForm.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2023 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 styled from 'reshadow';
-
-import { UserMetaParametersResource } from '@cloudbeaver/core-authentication';
-import { Container, ObjectPropertyInfoForm, useResource, useStyles } from '@cloudbeaver/core-blocks';
-import type { UserInfo } from '@cloudbeaver/core-sdk';
-import type { ComponentStyle } from '@cloudbeaver/core-theming';
-
-interface Props {
-  user: UserInfo;
-  className?: string;
-  style?: ComponentStyle;
-}
-
-export const MetaParameterInfoForm = observer<Props>(function MetaParameterInfoForm({ user, className, style }) {
-  const userMetaParameters = useResource(MetaParameterInfoForm, UserMetaParametersResource, undefined);
-  const styles = useStyles(style);
-
-  if (!userMetaParameters.data.length) {
-    return null;
-  }
-
-  return styled(styles)(
-    <Container className={className} wrap gap>
-      <ObjectPropertyInfoForm state={user.metaParameters} properties={userMetaParameters.data} category={null} disabled readOnly />
-    </Container>,
-  );
-});
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoPanel.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoPanel.tsx
deleted file mode 100644
index 2e49d6f45a..0000000000
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoPanel.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2023 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 styled from 'reshadow';
-
-import { useStyles } from '@cloudbeaver/core-blocks';
-import type { UserInfo } from '@cloudbeaver/core-sdk';
-import type { ComponentStyle } from '@cloudbeaver/core-theming';
-import { TabPanel } from '@cloudbeaver/core-ui';
-
-import { MetaParametersForm } from './MetaParametersForm';
-
-interface Props {
-  user: UserInfo;
-  className?: string;
-  style?: ComponentStyle;
-}
-
-export const MetaParameterInfoPanel = observer<Props>(function MetaParameterInfoPanel({ user, className, style }) {
-  const styles = useStyles(style);
-
-  return styled(styles)(
-    <TabPanel tabId="info" className={className}>
-      <MetaParametersForm user={user} />
-    </TabPanel>,
-  );
-});
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoTab.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoTab.tsx
deleted file mode 100644
index f22a5b0d89..0000000000
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoTab.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2023 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 styled from 'reshadow';
-
-import type { ComponentStyle } from '@cloudbeaver/core-theming';
-import { Tab, TabTitle } from '@cloudbeaver/core-ui';
-
-interface Props {
-  className?: string;
-  style?: ComponentStyle;
-}
-
-export const MetaParameterInfoTab = observer<Props>(function MetaParameterInfoTab({ className, style }) {
-  const translate = useTranslate();
-  const styles = useStyles(style);
-
-  return styled(styles)(
-    <Tab tabId="info" style={style} className={className}>
-      <TabTitle>{translate('plugin_user_profile_info')}</TabTitle>
-    </Tab>,
-  );
-});
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParametersForm.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParametersForm.tsx
deleted file mode 100644
index 3536d41716..0000000000
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParametersForm.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2023 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 styled from 'reshadow';
-
-import { ColoredContainer, Container, Group, InputField, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
-import type { UserInfo } from '@cloudbeaver/core-sdk';
-import type { ComponentStyle } from '@cloudbeaver/core-theming';
-import { AuthProvidersList } from '@cloudbeaver/plugin-user-profile';
-
-import { MetaParameterInfoForm } from './MetaParameterInfoForm';
-
-interface Props {
-  user: UserInfo;
-  className?: string;
-  style?: ComponentStyle;
-}
-
-export const MetaParametersForm = observer<Props>(function MetaParametersForm({ user, className, style }) {
-  const styles = useStyles(style);
-  const translate = useTranslate();
-
-  return styled(styles)(
-    <ColoredContainer wrap overflow parent gap>
-      <Container medium gap>
-        <Group form gap>
-          <Container wrap gap>
-            <InputField type="text" name="userId" minLength={1} state={user} mod="surface" disabled readOnly required tiny fill>
-              {translate('plugin_user_profile_info_id')}
-            </InputField>
-            <InputField type="text" name="displayName" minLength={1} state={user} mod="surface" disabled readOnly required tiny fill>
-              {translate('plugin_user_profile_info_displayName')}
-            </InputField>
-          </Container>
-          <MetaParameterInfoForm user={user} />
-        </Group>
-        <Group box medium overflow>
-          <AuthProvidersList user={user} providers={user.linkedAuthProviders} />
-        </Group>
-      </Container>
-    </ColoredContainer>,
-  );
-});
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserProfileFormState.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserProfileFormState.ts
deleted file mode 100644
index 358e9cfa14..0000000000
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserProfileFormState.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2023 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 { IFormStateInfo } from '@cloudbeaver/core-blocks';
-
-import type { IUserProfileFormState } from './IUserProfileFormState';
-
-export class UserProfileFormState implements IUserProfileFormState {
-  get info(): IFormStateInfo {
-    return {
-      disabled: false,
-      edited: false,
-      readonly: false,
-      statusMessage: null,
-    };
-  }
-
-  async validate(): Promise<void> {}
-
-  dispose(): void {}
-}
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetaParameterEdit.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetaParameterEdit.tsx
deleted file mode 100644
index 95629259ec..0000000000
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetaParameterEdit.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2023 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 { useCallback, useContext } from 'react';
-import styled, { css } from 'reshadow';
-
-import { Loader, TableContext, useStyles } from '@cloudbeaver/core-blocks';
-import { useController } from '@cloudbeaver/core-di';
-
-import { UserForm } from '../UserForm/UserForm';
-import { MetaParameterEditController } from './MetaParameterEditController';
-
-const styles = css`
-  box {
-    composes: theme-background-secondary theme-text-on-secondary from global;
-    box-sizing: border-box;
-    padding-bottom: 24px;
-    height: 520px;
-    display: flex;
-    flex-direction: column;
-  }
-`;
-
-interface Props {
-  item: string;
-}
-
-export const MetaParameterEdit = observer<Props>(function UserEdit({ item }) {
-  const controller = useController(MetaParameterEditController, item);
-  const tableContext = useContext(TableContext);
-  const collapse = useCallback(() => tableContext?.setItemExpand(item, false), [tableContext]);
-
-  return styled(useStyles(styles))(
-    <box>
-      {controller.user ? <UserForm user={controller.user} editing onCancel={collapse} /> : <Loader />}
-    </box>,
-  );
-});
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetaParameterEditController.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetaParameterEditController.ts
deleted file mode 100644
index cfd63f4ca0..0000000000
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetaParameterEditController.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2023 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 { computed, makeObservable, observable } from 'mobx';
-
-import { UsersResource } from '@cloudbeaver/core-authentication';
-import { IDestructibleController, IInitializableController, injectable } from '@cloudbeaver/core-di';
-import { NotificationService } from '@cloudbeaver/core-events';
-import { AdminUserInfo, GQLErrorCatcher, ResourceKey, ResourceKeyUtils } from '@cloudbeaver/core-sdk';
-
-@injectable()
-export class MetaParameterEditController implements IInitializableController, IDestructibleController {
-  isLoading = true;
-  user: AdminUserInfo | null = null;
-
-  get isDisabled() {
-    return this.usersResource.isDataLoading(this.userId);
-  }
-
-  userId!: string;
-
-  readonly error = new GQLErrorCatcher();
-
-  constructor(private readonly notificationService: NotificationService, private readonly usersResource: UsersResource) {
-    makeObservable(this, {
-      isLoading: observable,
-      user: observable,
-      isDisabled: computed,
-    });
-
-    this.updateUser = this.updateUser.bind(this);
-  }
-
-  async init(id: string): Promise<void> {
-    this.userId = id;
-
-    await this.loadUser();
-    this.usersResource.onItemUpdate.addHandler(this.updateUser);
-  }
-
-  destruct(): void {
-    this.usersResource.onItemUpdate.removeHandler(this.updateUser);
-  }
-
-  private async loadUser() {
-    try {
-      // we create a copy to protect the current value from mutation
-      await this.usersResource.load(this.userId);
-      await this.updateUser(this.userId);
-    } catch (exception: any) {
-      this.notificationService.logException(exception, `Can't load user ${this.userId}`);
-    }
-  }
-
-  private async updateUser(key: ResourceKey<string>) {
-    if (!ResourceKeyUtils.includes(key, this.userId)) {
-      return;
-    }
-    this.user = JSON.parse(JSON.stringify(await this.usersResource.load(this.userId)));
-  }
-}
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetaParameters.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetaParameters.tsx
deleted file mode 100644
index 6a422a9fa5..0000000000
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetaParameters.tsx
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2023 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 styled, { css, use } from 'reshadow';
-
-import type { IAdministrationItemSubItem } from '@cloudbeaver/core-administration';
-import { UserMetaParametersResource } from '@cloudbeaver/core-authentication';
-import {
-  BASE_LAYOUT_GRID_STYLES,
-  Loader,
-  Table,
-  TableBody,
-  TableColumnHeader,
-  TableHeader,
-  TableSelect,
-  ToolsAction,
-  ToolsPanel,
-  useResource,
-  useStyles,
-  useTranslate,
-} from '@cloudbeaver/core-blocks';
-import { useController, useService } from '@cloudbeaver/core-di';
-
-import { CreateMetaParameter } from './CreateMetaParameter';
-import { CreateMetaParameterService } from './CreateMetaParameterService';
-import { MetadataParam } from './MetadataParam';
-import { MetaParametersController } from './MetaParametersController';
-
-const layoutStyles = css`
-  layout-grid {
-    width: 100%;
-    overflow: auto;
-  }
-
-  layout-grid-inner {
-    min-height: 100%;
-  }
-
-  layout-grid-cell {
-    composes: theme-background-surface theme-text-on-surface theme-border-color-background from global;
-    position: relative;
-    border: solid 1px;
-  }
-`;
-
-const styles = css`
-  Table {
-    width: 100%;
-  }
-`;
-
-interface Props {
-  sub?: IAdministrationItemSubItem;
-  param?: string | null;
-}
-
-export const MetaParameters = observer<Props>(function MetaParameters({ sub, param }) {
-  const translate = useTranslate();
-  const controller = useController(MetaParametersController);
-  const createMetaParameterService = useService(CreateMetaParameterService);
-  const userMetaParametersResource = useResource(MetaParameters, UserMetaParametersResource, undefined);
-  const keys = userMetaParametersResource.data.map(metadata => metadata.id);
-  const isLocalProviderAvailable = controller.isLocalProviderAvailable;
-
-  return styled(useStyles(BASE_LAYOUT_GRID_STYLES, styles, layoutStyles))(
-    <layout-grid>
-      <layout-grid-inner>
-        <layout-grid-cell data-span="12">
-          <ToolsPanel>
-            {isLocalProviderAvailable && (
-              <ToolsAction
-                title={translate('authentication_administration_tools_add_tooltip')}
-                icon="add"
-                viewBox="0 0 24 24"
-                disabled={(sub && !!createMetaParameterService.user) || true}
-                onClick={createMetaParameterService.create}
-              >
-                {translate('ui_add')}
-              </ToolsAction>
-            )}
-            <ToolsAction
-              title={translate('authentication_administration_tools_refresh_tooltip')}
-              icon="refresh"
-              viewBox="0 0 24 24"
-              onClick={userMetaParametersResource.reload}
-            >
-              {translate('ui_refresh')}
-            </ToolsAction>
-            {isLocalProviderAvailable && (
-              <ToolsAction
-                title={translate('authentication_administration_tools_delete_tooltip')}
-                icon="trash"
-                viewBox="0 0 24 24"
-                disabled={!controller.itemsSelected || true}
-                onClick={controller.delete}
-              >
-                {translate('ui_delete')}
-              </ToolsAction>
-            )}
-          </ToolsPanel>
-        </layout-grid-cell>
-
-        {param === 'create' && createMetaParameterService.user && (
-          <layout-grid-cell data-span="12">
-            <CreateMetaParameter user={createMetaParameterService.user} onCancel={createMetaParameterService.cancelCreate} />
-          </layout-grid-cell>
-        )}
-        <layout-grid-cell data-span="12">
-          <Table keys={keys} selectedItems={controller.selectedItems} expandedItems={controller.expandedItems} size="big">
-            <TableHeader fixed>
-              {isLocalProviderAvailable && (
-                <TableColumnHeader min flex centerContent>
-                  <TableSelect />
-                </TableColumnHeader>
-              )}
-              <TableColumnHeader min />
-              <TableColumnHeader>{translate('authentication_user_name')}</TableColumnHeader>
-              <TableColumnHeader>{translate('authentication_user_team')}</TableColumnHeader>
-              <TableColumnHeader />
-            </TableHeader>
-            <TableBody>
-              {userMetaParametersResource.data.map(param => (
-                <MetadataParam key={param.id} param={param} selectable={isLocalProviderAvailable} />
-              ))}
-            </TableBody>
-          </Table>
-          <Loader state={userMetaParametersResource} overlay />
-        </layout-grid-cell>
-      </layout-grid-inner>
-    </layout-grid>,
-  );
-});
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetaParametersController.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetaParametersController.ts
deleted file mode 100644
index ce9177644a..0000000000
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetaParametersController.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2023 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 { computed, makeObservable, observable } from 'mobx';
-
-import { AdminUser, AUTH_PROVIDER_LOCAL_ID, AuthProvidersResource, compareUsers, UsersResource } from '@cloudbeaver/core-authentication';
-import { IInitializableController, injectable } from '@cloudbeaver/core-di';
-import { CommonDialogService, ConfirmationDialogDelete, DialogueStateResult } from '@cloudbeaver/core-dialogs';
-import { NotificationService } from '@cloudbeaver/core-events';
-import { LocalizationService } from '@cloudbeaver/core-localization';
-import { ErrorDetailsDialog } from '@cloudbeaver/core-notifications';
-import { CachedMapAllKey, GQLErrorCatcher, resourceKeyList } from '@cloudbeaver/core-sdk';
-
-@injectable()
-export class MetaParametersController implements IInitializableController {
-  isDeleting = false;
-  readonly selectedItems = observable<string, boolean>(new Map());
-  readonly expandedItems = observable<string, boolean>(new Map());
-  readonly error = new GQLErrorCatcher();
-
-  get users(): AdminUser[] {
-    return Array.from(this.usersResource.data.values()).sort(compareUsers);
-  }
-
-  get isProvidersLoading(): boolean {
-    return this.authProvidersResource.isLoading();
-  }
-
-  get isLocalProviderAvailable(): boolean {
-    return this.authProvidersResource.has(AUTH_PROVIDER_LOCAL_ID);
-  }
-
-  get isLoading(): boolean {
-    return this.usersResource.isLoading() || this.isDeleting;
-  }
-
-  get itemsSelected(): boolean {
-    return Array.from(this.selectedItems.values()).some(v => v);
-  }
-
-  constructor(
-    private readonly notificationService: NotificationService,
-    private readonly authProvidersResource: AuthProvidersResource,
-    private readonly usersResource: UsersResource,
-    private readonly commonDialogService: CommonDialogService,
-    private readonly localizationService: LocalizationService,
-  ) {
-    makeObservable(this, {
-      isDeleting: observable,
-      users: computed,
-      itemsSelected: computed,
-    });
-  }
-
-  init(): void {
-    this.authProvidersResource.load(CachedMapAllKey);
-  }
-
-  update = async () => {
-    try {
-      this.usersResource.markOutdated();
-      this.notificationService.logSuccess({ title: 'authentication_administration_tools_refresh_success' });
-    } catch (exception: any) {
-      if (!this.error.catch(exception)) {
-        this.notificationService.logException(exception, 'Users update failed');
-      }
-    }
-  };
-
-  delete = async () => {
-    if (this.isDeleting) {
-      return;
-    }
-
-    const deletionList = Array.from(this.selectedItems)
-      .filter(([_, value]) => value)
-      .map(([userId]) => userId);
-    if (deletionList.length === 0) {
-      return;
-    }
-
-    const userNames = deletionList.map(name => `"${name}"`).join(', ');
-    const message = `${this.localizationService.translate(
-      'authentication_administration_users_delete_confirmation',
-    )}${userNames}. ${this.localizationService.translate('ui_are_you_sure')}`;
-
-    const result = await this.commonDialogService.open(ConfirmationDialogDelete, {
-      title: 'ui_data_delete_confirmation',
-      message,
-      confirmActionText: 'ui_delete',
-    });
-
-    if (result === DialogueStateResult.Rejected) {
-      return;
-    }
-
-    this.isDeleting = true;
-
-    try {
-      await this.usersResource.delete(resourceKeyList(deletionList));
-      this.selectedItems.clear();
-
-      for (const id of deletionList) {
-        this.expandedItems.delete(id);
-      }
-    } catch (exception: any) {
-      if (!this.error.catch(exception)) {
-        this.notificationService.logException(exception, 'User delete failed');
-      }
-    } finally {
-      this.isDeleting = false;
-    }
-  };
-
-  showDetails = () => {
-    if (this.error.exception) {
-      this.commonDialogService.open(ErrorDetailsDialog, this.error.exception);
-    }
-  };
-}
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetadataParam.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetadataParam.tsx
deleted file mode 100644
index 7317cd6492..0000000000
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetadataParam.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2023 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 styled, { css } from 'reshadow';
-
-import { TableColumnValue, TableItem, TableItemExpand, TableItemSelect } from '@cloudbeaver/core-blocks';
-import type { ObjectPropertyInfo } from '@cloudbeaver/core-sdk';
-
-const styles = css`
-  TableColumnValue[expand] {
-    cursor: pointer;
-  }
-`;
-
-interface Props {
-  param: ObjectPropertyInfo;
-  selectable?: boolean;
-}
-
-export const MetadataParam = observer<Props>(function MetadataParam({ param, selectable }) {
-  return styled(styles)(
-    <TableItem item={param.id} selectDisabled={!selectable}>
-      {selectable && (
-        <TableColumnValue centerContent flex>
-          <TableItemSelect />
-        </TableColumnValue>
-      )}
-      <TableColumnValue centerContent flex expand>
-        <TableItemExpand />
-      </TableColumnValue>
-      <TableColumnValue expand>{param.id}</TableColumnValue>
-      <TableColumnValue>{param.description}</TableColumnValue>
-      <TableColumnValue>{}</TableColumnValue>
-    </TableItem>,
-  );
-});
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/UserDetailsInfo/Origin.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/UserDetailsInfo/Origin.tsx
deleted file mode 100644
index b2f8af52b6..0000000000
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/UserDetailsInfo/Origin.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2023 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 styled, { css } from 'reshadow';
-
-import { AUTH_PROVIDER_LOCAL_ID } from '@cloudbeaver/core-authentication';
-import { PlaceholderComponent, StaticImage } from '@cloudbeaver/core-blocks';
-import type { ObjectOrigin } from '@cloudbeaver/core-sdk';
-
-import type { IUserDetailsInfoProps } from '../../UsersAdministrationService';
-
-const USER_DETAILS_STYLES = css`
-  StaticImage {
-    width: 24px;
-    height: 24px;
-  }
-`;
-
-interface IOriginIconProps {
-  origin: ObjectOrigin;
-}
-
-export const OriginIcon = observer<IOriginIconProps>(function Origin({ origin }) {
-  const isLocal = origin.type === AUTH_PROVIDER_LOCAL_ID;
-  const icon = isLocal ? '/icons/local_connection.svg' : origin.icon;
-  const title = isLocal ? 'Local user' : origin.displayName;
-
-  return styled(USER_DETAILS_STYLES)(<StaticImage key={origin.type + origin.subType} icon={icon} title={title} />);
-});
-
-export const Origin: PlaceholderComponent<IUserDetailsInfoProps> = observer(function Origin({ user }) {
-  return (
-    <>
-      {user.origins.map(origin => (
-        <OriginIcon key={origin.type + origin.subType} origin={origin} />
-      ))}
-    </>
-  );
-});
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/Options/TeamOptions.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/Options/TeamOptions.tsx
index 8982194146..2455a60f2d 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/Options/TeamOptions.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/Options/TeamOptions.tsx
@@ -9,7 +9,7 @@ import { observer } from 'mobx-react-lite';
 import { useRef } from 'react';
 import styled, { css } from 'reshadow';
 
-import { ColoredContainer, Group, InputField, SubmittingForm, Textarea, useResource, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
+import { ColoredContainer, Form, Group, InputField, Textarea, useResource, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import { ServerConfigResource } from '@cloudbeaver/core-root';
 import type { TabContainerPanelComponent } from '@cloudbeaver/core-ui';
 
@@ -18,7 +18,7 @@ import { Permissions } from './Permissions';
 import { TeamMetaParameters } from './TeamMetaParameters';
 
 const styles = css`
-  SubmittingForm {
+  Form {
     flex: 1;
     overflow: auto;
   }
@@ -32,7 +32,7 @@ export const TeamOptions: TabContainerPanelComponent<ITeamFormProps> = observer(
   const edit = state.mode === 'edit';
 
   return styled(style)(
-    <SubmittingForm ref={formRef}>
+    <Form ref={formRef}>
       <ColoredContainer parent gap overflow>
         <Group small gap>
           <InputField name="teamId" state={state.config} readOnly={state.readonly || edit} disabled={state.disabled} required tiny fill>
@@ -48,6 +48,6 @@ export const TeamOptions: TabContainerPanelComponent<ITeamFormProps> = observer(
         {!serverConfigResource.resource.distributed && <Permissions state={state} />}
         <TeamMetaParameters state={state} />
       </ColoredContainer>
-    </SubmittingForm>,
+    </Form>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsTable/useTeamsTable.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsTable/useTeamsTable.tsx
index fef6f9a496..793080abb9 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsTable/useTeamsTable.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/TeamsTable/useTeamsTable.tsx
@@ -84,7 +84,7 @@ export function useTeamsTable(): Readonly<State> {
           await resource.resource.deleteTeam(resourceKeyList(deletionList), { force: true });
 
           this.tableState.unselect();
-          this.tableState.unexpand(deletionList);
+          this.tableState.collapse(deletionList);
         } catch (exception: any) {
           notificationService.logException(exception, 'Teams delete Error');
         } finally {
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserForm.m.css b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserForm.m.css
new file mode 100644
index 0000000000..cd77470f61
--- /dev/null
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserForm.m.css
@@ -0,0 +1,45 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+
+.bar {
+  composes: theme-border-color-background theme-background-secondary theme-text-on-secondary from global;
+  position: relative;
+  display: flex;
+  margin-bottom: 16px;
+
+  &:before {
+    content: '';
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    border-bottom: solid 2px;
+    border-color: inherit;
+  }
+}
+
+.tabList {
+  display: flex;
+  position: relative;
+  flex-shrink: 0;
+  align-items: center;
+}
+
+.contentBox {
+  composes: theme-background-secondary theme-text-on-secondary theme-border-color-background from global;
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+  overflow: auto;
+}
+
+.submittingForm {
+  flex: 1;
+  overflow: auto;
+  display: flex;
+  flex-direction: column;
+}
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserForm.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserForm.tsx
new file mode 100644
index 0000000000..f667f71f29
--- /dev/null
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserForm.tsx
@@ -0,0 +1,96 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { Button, Container, Form, s, StatusMessage, useAutoLoad, useForm, useS, useTranslate } from '@cloudbeaver/core-blocks';
+import { useService } from '@cloudbeaver/core-di';
+import { NotificationService } from '@cloudbeaver/core-events';
+import {
+  BASE_TAB_STYLES,
+  FormMode,
+  IFormState,
+  TabList,
+  TabPanelList,
+  TabsState,
+  UNDERLINE_TAB_BIG_STYLES,
+  UNDERLINE_TAB_STYLES,
+} from '@cloudbeaver/core-ui';
+import { getFirstException } from '@cloudbeaver/core-utils';
+
+import style from './AdministrationUserForm.m.css';
+import { AdministrationUserFormService, IUserFormState } from './AdministrationUserFormService';
+import { DATA_CONTEXT_USER_FORM_INFO_PART } from './Info/DATA_CONTEXT_USER_FORM_INFO_PART';
+
+interface Props {
+  state: IFormState<IUserFormState>;
+  onClose: () => void;
+}
+
+const deprecatedStyle = [BASE_TAB_STYLES, UNDERLINE_TAB_STYLES, UNDERLINE_TAB_BIG_STYLES];
+export const AdministrationUserForm = observer<Props>(function AdministrationUserForm({ state, onClose }) {
+  const styles = useS(style);
+  const translate = useTranslate();
+  const notificationService = useService(NotificationService);
+  const administrationUserFormService = useService(AdministrationUserFormService);
+  const editing = state.mode === FormMode.Edit;
+  const form = useForm({
+    async onSubmit() {
+      const mode = state.mode;
+      const saved = await state.save();
+      const userFormInfoPart = state.dataContext.get(DATA_CONTEXT_USER_FORM_INFO_PART);
+
+      if (saved) {
+        if (mode === FormMode.Create) {
+          onClose();
+          notificationService.logSuccess({ title: 'authentication_administration_user_created', message: userFormInfoPart.state.userId });
+        } else {
+          notificationService.logSuccess({ title: 'authentication_administration_user_updated', message: userFormInfoPart.state.userId });
+        }
+      } else {
+        if (state.mode === FormMode.Create) {
+          // user not created
+          notificationService.logError({ title: 'authentication_administration_user_create_failed' });
+        } else {
+          // user created but not all data saved correctly
+          if (mode === FormMode.Create) {
+            notificationService.logSuccess({ title: 'authentication_administration_user_created', message: userFormInfoPart.state.userId });
+          }
+          notificationService.logError({ title: 'authentication_administration_user_update_failed' });
+        }
+      }
+    },
+  });
+
+  useAutoLoad(AdministrationUserForm, state);
+
+  return (
+    <Form context={form} className={s(styles, { submittingForm: true })} disabled={state.isDisabled} focusFirstChild>
+      <TabsState container={administrationUserFormService.parts} localState={state.parts} formState={state}>
+        <Container compact parent noWrap vertical>
+          <Container className={s(styles, { bar: true })} gap keepSize noWrap>
+            <Container fill>
+              <StatusMessage exception={getFirstException(state.exception)} type={state.statusType} message={state.statusMessage} />
+              <TabList className={s(styles, { tabList: true })} style={deprecatedStyle} />
+            </Container>
+            <Container keepSize noWrap center gap compact>
+              <Button type="button" disabled={state.isDisabled} mod={['outlined']} onClick={onClose}>
+                {translate('ui_processing_cancel')}
+              </Button>
+              <Button type="button" disabled={state.isDisabled} mod={['unelevated']} onClick={() => form.submit()}>
+                {translate(!editing ? 'ui_processing_create' : 'ui_processing_save')}
+              </Button>
+            </Container>
+          </Container>
+          <Container vertical>
+            <TabPanelList />
+          </Container>
+        </Container>
+      </TabsState>
+    </Form>
+  );
+});
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserFormService.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserFormService.ts
new file mode 100644
index 0000000000..0b163cc47c
--- /dev/null
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserFormService.ts
@@ -0,0 +1,24 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { injectable } from '@cloudbeaver/core-di';
+import { NotificationService } from '@cloudbeaver/core-events';
+import { LocalizationService } from '@cloudbeaver/core-localization';
+import { FormBaseService, IFormProps } from '@cloudbeaver/core-ui';
+
+export interface IUserFormState {
+  userId: string | null;
+}
+
+export type UserFormProps = IFormProps<IUserFormState>;
+
+@injectable()
+export class AdministrationUserFormService extends FormBaseService<IUserFormState, UserFormProps> {
+  constructor(localizationService: LocalizationService, notificationService: NotificationService) {
+    super(localizationService, notificationService, 'Administration User form');
+  }
+}
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserFormState.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserFormState.ts
new file mode 100644
index 0000000000..a4e02e430a
--- /dev/null
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/AdministrationUserFormState.ts
@@ -0,0 +1,17 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { App } from '@cloudbeaver/core-di';
+import { FormState } from '@cloudbeaver/core-ui';
+
+import type { AdministrationUserFormService, IUserFormState } from './AdministrationUserFormService';
+
+export class AdministrationUserFormState extends FormState<IUserFormState> {
+  constructor(app: App, service: AdministrationUserFormService, config: IUserFormState) {
+    super(app, service, config);
+  }
+}
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/ConnectionAccess.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/ConnectionAccess.tsx
deleted file mode 100644
index 4c37308a71..0000000000
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/ConnectionAccess.tsx
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2023 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 { computed } from 'mobx';
-import { observer } from 'mobx-react-lite';
-import { useCallback, useMemo } from 'react';
-import styled, { css } from 'reshadow';
-
-import {
-  ColoredContainer,
-  Group,
-  StaticImage,
-  Table,
-  TableBody,
-  TableColumnHeader,
-  TableColumnValue,
-  TableHeader,
-  TableItem,
-  TableItemSelect,
-  TextPlaceholder,
-  useStyles,
-  useTranslate,
-} from '@cloudbeaver/core-blocks';
-import { DBDriverResource, isCloudConnection } from '@cloudbeaver/core-connections';
-import { useService } from '@cloudbeaver/core-di';
-import { AdminSubjectType } from '@cloudbeaver/core-sdk';
-import type { TabContainerPanelComponent } from '@cloudbeaver/core-ui';
-
-import type { IUserFormProps } from '../UserFormService';
-
-const styles = css`
-  Table {
-    composes: theme-background-surface theme-text-on-surface from global;
-    width: 100%;
-  }
-  StaticImage {
-    display: flex;
-    width: 24px;
-  }
-`;
-
-export const ConnectionAccess: TabContainerPanelComponent<IUserFormProps> = observer(function ConnectionAccess({ controller, editing }) {
-  const style = useStyles(styles);
-  const translate = useTranslate();
-  const driversResource = useService(DBDriverResource);
-  const getConnectionPermission = useCallback(
-    (connectionId: string) => controller.grantedConnections.find(connectionPermission => connectionPermission.dataSourceId === connectionId),
-    [controller.grantedConnections],
-  );
-  const loading = controller.isLoading;
-  const cloudExists = controller.connections.some(isCloudConnection);
-  const localConnections = useMemo(
-    () => computed(() => controller.connections.filter(connection => !isCloudConnection(connection))),
-    [controller.connections],
-  );
-  const isAdmin = controller.user.grantedTeams.includes('admin');
-
-  if (controller.connections.length === 0) {
-    return styled(style)(
-      <ColoredContainer parent>
-        <Group large>
-          <TextPlaceholder>{translate('authentication_administration_user_connections_empty')}</TextPlaceholder>
-        </Group>
-      </ColoredContainer>,
-    );
-  }
-
-  if (isAdmin) {
-    return styled(style)(
-      <ColoredContainer parent>
-        <Group large>
-          <TextPlaceholder>{translate('connections_connection_access_admin_info')}</TextPlaceholder>
-        </Group>
-      </ColoredContainer>,
-    );
-  }
-
-  return styled(style)(
-    <ColoredContainer parent overflow>
-      <Group box large>
-        <Table selectedItems={controller.selectedConnections} size="big" onSelect={controller.handleConnectionsAccessChange}>
-          <TableHeader fixed>
-            <TableColumnHeader min />
-            <TableColumnHeader min />
-            <TableColumnHeader>{translate('connections_connection_name')}</TableColumnHeader>
-            <TableColumnHeader>{translate('authentication_administration_user_connections_access_granted_by')}</TableColumnHeader>
-          </TableHeader>
-          <TableBody>
-            {cloudExists && (
-              <TableItem item="cloudInfo" selectDisabled>
-                <TableColumnValue colSpan={4}>{translate('cloud_connections_access_placeholder')}</TableColumnValue>
-              </TableItem>
-            )}
-            {localConnections.get().map(connection => {
-              const connectionPermission = getConnectionPermission(connection.id);
-              const driver = driversResource.get(connection.driverId);
-              const isTeamProvided = connectionPermission?.subjectType === AdminSubjectType.Team;
-
-              let grantedBy = '';
-              if (isTeamProvided) {
-                grantedBy = `${translate('authentication_administration_user_connections_access_granted_team')} ${connectionPermission.subjectId}`;
-              } else if (connectionPermission) {
-                grantedBy = translate('authentication_administration_user_connections_access_granted_directly');
-              }
-
-              return (
-                <TableItem key={connection.id} item={connection.id} selectDisabled={isTeamProvided}>
-                  <TableColumnValue centerContent flex>
-                    <TableItemSelect disabled={loading || isTeamProvided} checked={isTeamProvided} />
-                  </TableColumnValue>
-                  <TableColumnValue>
-                    <StaticImage icon={driver?.icon} />
-                  </TableColumnValue>
-                  <TableColumnValue title={connection.name} ellipsis>
-                    {connection.name}
-                  </TableColumnValue>
-                  <TableColumnValue title={grantedBy}>{grantedBy}</TableColumnValue>
-                </TableItem>
-              );
-            })}
-          </TableBody>
-        </Table>
-      </Group>
-    </ColoredContainer>,
-  );
-});
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/ConnectionAccessTabBootstrap.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/ConnectionAccessTabBootstrap.ts
deleted file mode 100644
index ef6da43c16..0000000000
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/ConnectionAccessTabBootstrap.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2023 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';
-
-import { Bootstrap, injectable } from '@cloudbeaver/core-di';
-import { isGlobalProject, ProjectInfoResource } from '@cloudbeaver/core-projects';
-import { CachedMapAllKey } from '@cloudbeaver/core-sdk';
-
-import { UserFormService } from '../UserFormService';
-
-const ConnectionAccess = React.lazy(async () => {
-  const { ConnectionAccess } = await import('./ConnectionAccess');
-  return { default: ConnectionAccess };
-});
-
-@injectable()
-export class ConnectionAccessTabBootstrap extends Bootstrap {
-  constructor(private readonly userFormService: UserFormService, private readonly projectInfoResource: ProjectInfoResource) {
-    super();
-  }
-
-  register(): void {
-    this.userFormService.tabsContainer.add({
-      key: 'connections_access',
-      name: 'authentication_administration_user_connections_access',
-      title: 'authentication_administration_user_connections_access',
-      order: 3,
-      panel: () => ConnectionAccess,
-      isHidden: () => !this.projectInfoResource.values.some(isGlobalProject),
-      onOpen: ({ props }) => props.controller.loadConnectionsAccess(),
-    });
-
-    this.userFormService.onFormInit.addHandler(() => this.projectInfoResource.load(CachedMapAllKey));
-  }
-
-  load(): void {}
-}
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/DATA_CONTEXT_USER_FORM_CONNECTION_ACCESS_PART.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/DATA_CONTEXT_USER_FORM_CONNECTION_ACCESS_PART.ts
new file mode 100644
index 0000000000..540d2084bb
--- /dev/null
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/DATA_CONTEXT_USER_FORM_CONNECTION_ACCESS_PART.ts
@@ -0,0 +1,27 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { UsersResource } from '@cloudbeaver/core-authentication';
+import { DATA_CONTEXT_FORM_STATE } from '@cloudbeaver/core-ui';
+import { createDataContext, DATA_CONTEXT_DI_PROVIDER } from '@cloudbeaver/core-view';
+
+import type { AdministrationUserFormState } from '../AdministrationUserFormState';
+import { DATA_CONTEXT_USER_FORM_INFO_PART } from '../Info/DATA_CONTEXT_USER_FORM_INFO_PART';
+import { UserFormConnectionAccessPart } from './UserFormConnectionAccessPart';
+
+export const DATA_CONTEXT_USER_FORM_CONNECTION_ACCESS_PART = createDataContext<UserFormConnectionAccessPart>(
+  'User Form Connection Access Part',
+  context => {
+    context.get(DATA_CONTEXT_USER_FORM_INFO_PART); // ensure that info part is loaded first
+
+    const form = context.get(DATA_CONTEXT_FORM_STATE) as AdministrationUserFormState;
+    const di = context.get(DATA_CONTEXT_DI_PROVIDER);
+    const usersResource = di.getServiceByClass(UsersResource);
+
+    return new UserFormConnectionAccessPart(form, usersResource);
+  },
+);
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/UserFormConnectionAccess.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/UserFormConnectionAccess.tsx
new file mode 100644
index 0000000000..4b32a74add
--- /dev/null
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/UserFormConnectionAccess.tsx
@@ -0,0 +1,119 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 {
+  ColoredContainer,
+  Group,
+  Table,
+  TableBody,
+  TableColumnHeader,
+  TableColumnValue,
+  TableHeader,
+  TableItem,
+  TextPlaceholder,
+  useAutoLoad,
+  useResource,
+  useTranslate,
+} from '@cloudbeaver/core-blocks';
+import {
+  compareConnectionsInfo,
+  ConnectionInfoProjectKey,
+  ConnectionInfoResource,
+  DBDriverResource,
+  isCloudConnection,
+} from '@cloudbeaver/core-connections';
+import { useService } from '@cloudbeaver/core-di';
+import { isGlobalProject, ProjectInfoResource } from '@cloudbeaver/core-projects';
+import { CachedMapAllKey, resourceKeyList } from '@cloudbeaver/core-sdk';
+import { type TabContainerPanelComponent, useTab, useTabState } from '@cloudbeaver/core-ui';
+import { isDefined } from '@cloudbeaver/core-utils';
+
+import type { UserFormProps } from '../AdministrationUserFormService';
+import type { UserFormConnectionAccessPart } from './UserFormConnectionAccessPart';
+import { UserFormConnectionTableItem } from './UserFormConnectionTableItem';
+
+export const UserFormConnectionAccess: TabContainerPanelComponent<UserFormProps> = observer(function UserFormConnectionAccess({ tabId }) {
+  const translate = useTranslate();
+  const tab = useTab(tabId);
+  const driversResource = useService(DBDriverResource);
+  const tabState = useTabState<UserFormConnectionAccessPart>();
+  const projectLoader = useResource(UserFormConnectionAccess, ProjectInfoResource, CachedMapAllKey, { active: tab.selected });
+  const connectionsLoader = useResource(
+    UserFormConnectionAccess,
+    ConnectionInfoResource,
+    ConnectionInfoProjectKey(...projectLoader.data.filter(isGlobalProject).map(project => project.id)),
+    { active: tab.selected },
+  );
+
+  const connections = connectionsLoader.data.filter(isDefined).sort(compareConnectionsInfo);
+  const cloudExists = connections.some(isCloudConnection);
+  const localConnections = connections.filter(connection => !isCloudConnection(connection));
+
+  useResource(
+    UserFormConnectionAccess,
+    driversResource,
+    resourceKeyList(Array.from(new Set(localConnections.map(connection => connection.driverId)))),
+    {
+      active: tab.selected,
+    },
+  );
+
+  useAutoLoad(UserFormConnectionAccess, tabState, tab.selected);
+
+  if (connections.length === 0) {
+    return (
+      <ColoredContainer>
+        <Group large>
+          <TextPlaceholder>{translate('authentication_administration_user_connections_empty')}</TextPlaceholder>
+        </Group>
+      </ColoredContainer>
+    );
+  }
+
+  function handleSelect(connectionId: string, state: boolean) {
+    if (state) {
+      tabState.add(connectionId);
+    } else {
+      tabState.delete(connectionId);
+    }
+  }
+
+  const disabled = tabState.isLoading();
+  // let info: TLocalizationToken | null = null;
+
+  // if (formState.mode === FormMode.Edit && tabState.isChanged()) {
+  //   info = 'ui_save_reminder';
+  // }
+
+  return (
+    <ColoredContainer vertical gap>
+      {/* {info && <InfoItem info={info} />} */}
+      <Group box large overflow>
+        <Table onSelect={handleSelect}>
+          <TableHeader fixed>
+            <TableColumnHeader min />
+            <TableColumnHeader min />
+            <TableColumnHeader>{translate('connections_connection_name')}</TableColumnHeader>
+            <TableColumnHeader>{translate('authentication_administration_user_connections_access_granted_by')}</TableColumnHeader>
+          </TableHeader>
+          <TableBody>
+            {cloudExists && (
+              <TableItem item="cloudInfo" selectDisabled>
+                <TableColumnValue colSpan={4}>{translate('cloud_connections_access_placeholder')}</TableColumnValue>
+              </TableItem>
+            )}
+            {localConnections.map(connection => (
+              <UserFormConnectionTableItem key={connection.id} connection={connection} disabled={disabled} />
+            ))}
+          </TableBody>
+        </Table>
+      </Group>
+    </ColoredContainer>
+  );
+});
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/UserFormConnectionAccessPanel.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/UserFormConnectionAccessPanel.tsx
new file mode 100644
index 0000000000..e05e5063ee
--- /dev/null
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/UserFormConnectionAccessPanel.tsx
@@ -0,0 +1,41 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { ColoredContainer, Group, TextPlaceholder, useAutoLoad, useTranslate } from '@cloudbeaver/core-blocks';
+import { type TabContainerPanelComponent, useTab } from '@cloudbeaver/core-ui';
+
+import type { UserFormProps } from '../AdministrationUserFormService';
+import { DATA_CONTEXT_USER_FORM_INFO_PART } from '../Info/DATA_CONTEXT_USER_FORM_INFO_PART';
+import { UserFormConnectionAccess } from './UserFormConnectionAccess';
+
+export const UserFormConnectionAccessPanel: TabContainerPanelComponent<UserFormProps> = observer(function UserFormConnectionAccessPanel({
+  tabId,
+  formState,
+  ...rest
+}) {
+  const tab = useTab(tabId);
+  const translate = useTranslate();
+  const userFormInfoPart = formState.dataContext.get(DATA_CONTEXT_USER_FORM_INFO_PART);
+
+  useAutoLoad(UserFormConnectionAccessPanel, userFormInfoPart, tab.selected);
+
+  const isAdmin = userFormInfoPart.state.teams.includes('admin');
+
+  if (isAdmin) {
+    return (
+      <ColoredContainer>
+        <Group large>
+          <TextPlaceholder>{translate('connections_connection_access_admin_info')}</TextPlaceholder>
+        </Group>
+      </ColoredContainer>
+    );
+  }
+
+  return <UserFormConnectionAccess tabId={tabId} formState={formState} {...rest} />;
+});
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/UserFormConnectionAccessPart.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/UserFormConnectionAccessPart.ts
new file mode 100644
index 0000000000..c1e59f6e08
--- /dev/null
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/UserFormConnectionAccessPart.ts
@@ -0,0 +1,76 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { UsersResource } from '@cloudbeaver/core-authentication';
+import { type AdminConnectionGrantInfo, AdminSubjectType } from '@cloudbeaver/core-sdk';
+import { FormMode, FormPart } from '@cloudbeaver/core-ui';
+import { isArraysEqual } from '@cloudbeaver/core-utils';
+
+import type { IUserFormState } from '../AdministrationUserFormService';
+import type { AdministrationUserFormState } from '../AdministrationUserFormState';
+import { DATA_CONTEXT_USER_FORM_INFO_PART } from '../Info/DATA_CONTEXT_USER_FORM_INFO_PART';
+
+export class UserFormConnectionAccessPart extends FormPart<AdminConnectionGrantInfo[], IUserFormState> {
+  constructor(formState: AdministrationUserFormState, private readonly usersResource: UsersResource) {
+    super(formState, []);
+  }
+
+  isChanged(): boolean {
+    if (!this.loaded) {
+      return false;
+    }
+
+    return !isArraysEqual(this.getGrantedConnections(this.state), this.getGrantedConnections(this.initialState));
+  }
+
+  has(connectionId: string): boolean {
+    return this.state.some(connection => connection.dataSourceId === connectionId);
+  }
+
+  add(connectionId: string): void {
+    if (this.has(connectionId)) {
+      return;
+    }
+
+    this.state.push({
+      subjectId: '',
+      subjectType: AdminSubjectType.User,
+      dataSourceId: connectionId,
+      connectionId,
+    });
+  }
+
+  delete(connectionId: string): void {
+    const index = this.state.findIndex(connection => connection.dataSourceId === connectionId);
+
+    if (index === -1) {
+      return;
+    }
+
+    this.state.splice(index, 1);
+  }
+
+  protected override async saveChanges() {
+    const userFormInfoPart = this.formState.dataContext.get(DATA_CONTEXT_USER_FORM_INFO_PART);
+    await this.usersResource.setConnections(userFormInfoPart.state.userId, this.getGrantedConnections(this.state));
+  }
+
+  private getGrantedConnections(state: AdminConnectionGrantInfo[]): string[] {
+    return state.filter(connection => connection.subjectType !== AdminSubjectType.Team).map(connection => connection.dataSourceId);
+  }
+
+  protected override async loader() {
+    const userFormInfoPart = this.formState.dataContext.get(DATA_CONTEXT_USER_FORM_INFO_PART);
+    let grantedConnections: AdminConnectionGrantInfo[] = [];
+
+    if (this.formState.mode === FormMode.Edit) {
+      grantedConnections = await this.usersResource.loadConnections(userFormInfoPart.initialState.userId);
+    }
+
+    this.setInitialState(grantedConnections);
+  }
+}
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/UserFormConnectionAccessPartBootstrap.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/UserFormConnectionAccessPartBootstrap.ts
new file mode 100644
index 0000000000..5bd5b3cec1
--- /dev/null
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/UserFormConnectionAccessPartBootstrap.ts
@@ -0,0 +1,45 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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';
+
+import { Bootstrap, injectable } from '@cloudbeaver/core-di';
+import { isGlobalProject, ProjectInfoResource } from '@cloudbeaver/core-projects';
+import { CachedMapAllKey, getCachedMapResourceLoaderState } from '@cloudbeaver/core-sdk';
+
+import { AdministrationUserFormService } from '../AdministrationUserFormService';
+import { DATA_CONTEXT_USER_FORM_CONNECTION_ACCESS_PART } from './DATA_CONTEXT_USER_FORM_CONNECTION_ACCESS_PART';
+
+const UserFormConnectionAccessPanel = React.lazy(async () => {
+  const { UserFormConnectionAccessPanel } = await import('./UserFormConnectionAccessPanel');
+  return { default: UserFormConnectionAccessPanel };
+});
+
+@injectable()
+export class UserFormConnectionAccessPartBootstrap extends Bootstrap {
+  constructor(
+    private readonly administrationUserFormService: AdministrationUserFormService,
+    private readonly projectInfoResource: ProjectInfoResource,
+  ) {
+    super();
+  }
+
+  register(): void {
+    this.administrationUserFormService.parts.add({
+      key: 'connections_access',
+      name: 'authentication_administration_user_connections_access',
+      title: 'authentication_administration_user_connections_access',
+      order: 3,
+      panel: () => UserFormConnectionAccessPanel,
+      isHidden: () => !this.projectInfoResource.values.some(isGlobalProject),
+      stateGetter: props => () => props.formState.dataContext.get(DATA_CONTEXT_USER_FORM_CONNECTION_ACCESS_PART),
+      getLoader: () => getCachedMapResourceLoaderState(this.projectInfoResource, () => CachedMapAllKey),
+    });
+  }
+
+  load(): void {}
+}
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/UserFormConnectionTableItem.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/UserFormConnectionTableItem.tsx
new file mode 100644
index 0000000000..b93507e5a1
--- /dev/null
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess/UserFormConnectionTableItem.tsx
@@ -0,0 +1,56 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { StaticImage, TableColumnValue, TableItem, TableItemSelect, useTranslate } from '@cloudbeaver/core-blocks';
+import { type Connection, DBDriverResource } from '@cloudbeaver/core-connections';
+import { useService } from '@cloudbeaver/core-di';
+import { AdminSubjectType } from '@cloudbeaver/core-sdk';
+import { useTabState } from '@cloudbeaver/core-ui';
+
+import type { UserFormConnectionAccessPart } from './UserFormConnectionAccessPart';
+
+interface Props {
+  connection: Connection;
+  disabled?: boolean;
+}
+
+export const UserFormConnectionTableItem = observer<Props>(function UserFormConnectionTableItem({ connection, disabled }) {
+  const translate = useTranslate();
+  const tabState = useTabState<UserFormConnectionAccessPart>();
+  const driversResource = useService(DBDriverResource);
+
+  const connectionPermission = tabState.initialState.find(connectionPermission => connectionPermission.dataSourceId === connection.id);
+  const driver = driversResource.get(connection.driverId);
+  const isTeamProvided = connectionPermission?.subjectType === AdminSubjectType.Team;
+
+  let grantedBy = '';
+  if (isTeamProvided) {
+    grantedBy = `${translate('authentication_administration_user_connections_access_granted_team')} ${connectionPermission.subjectId}`;
+  } else if (connectionPermission) {
+    grantedBy = translate('authentication_administration_user_connections_access_granted_directly');
+  }
+
+  disabled ||= isTeamProvided;
+  const selected = isTeamProvided || tabState.has(connection.id);
+
+  return (
+    <TableItem key={connection.id} item={connection.id} selectDisabled={disabled}>
+      <TableColumnValue centerContent flex>
+        <TableItemSelect disabled={disabled} checked={selected} />
+      </TableColumnValue>
+      <TableColumnValue centerContent>
+        <StaticImage icon={driver?.icon} width={24} block />
+      </TableColumnValue>
+      <TableColumnValue title={connection.name} ellipsis>
+        {connection.name}
+      </TableColumnValue>
+      <TableColumnValue title={grantedBy}>{grantedBy}</TableColumnValue>
+    </TableItem>
+  );
+});
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/DATA_CONTEXT_USER_FORM_INFO_PART.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/DATA_CONTEXT_USER_FORM_INFO_PART.ts
new file mode 100644
index 0000000000..8d05cd95db
--- /dev/null
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/DATA_CONTEXT_USER_FORM_INFO_PART.ts
@@ -0,0 +1,23 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { UsersResource } from '@cloudbeaver/core-authentication';
+import { ServerConfigResource } from '@cloudbeaver/core-root';
+import { DATA_CONTEXT_FORM_STATE } from '@cloudbeaver/core-ui';
+import { createDataContext, DATA_CONTEXT_DI_PROVIDER } from '@cloudbeaver/core-view';
+
+import type { AdministrationUserFormState } from '../AdministrationUserFormState';
+import { UserFormInfoPart } from './UserFormInfoPart';
+
+export const DATA_CONTEXT_USER_FORM_INFO_PART = createDataContext<UserFormInfoPart>('User Form Info Part', context => {
+  const form = context.get(DATA_CONTEXT_FORM_STATE) as AdministrationUserFormState;
+  const di = context.get(DATA_CONTEXT_DI_PROVIDER);
+  const usersResource = di.getServiceByClass(UsersResource);
+  const serverConfigResource = di.getServiceByClass(ServerConfigResource);
+
+  return new UserFormInfoPart(serverConfigResource, form, usersResource);
+});
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/IUserFormInfoState.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/IUserFormInfoState.ts
new file mode 100644
index 0000000000..bce9d0749f
--- /dev/null
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/IUserFormInfoState.ts
@@ -0,0 +1,15 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 IUserFormInfoState {
+  userId: string;
+  enabled: boolean;
+  password: string;
+  metaParameters: Record<string, any>;
+  teams: string[];
+}
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfo.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfo.tsx
new file mode 100644
index 0000000000..867e158c80
--- /dev/null
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfo.tsx
@@ -0,0 +1,55 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { ColoredContainer, Container, FieldCheckbox, Group, GroupTitle, Placeholder, useAutoLoad, useTranslate } from '@cloudbeaver/core-blocks';
+import { useService } from '@cloudbeaver/core-di';
+import { TabContainerPanelComponent, useTab, useTabState } from '@cloudbeaver/core-ui';
+
+import type { UserFormProps } from '../AdministrationUserFormService';
+import { UserFormInfoCredentials } from './UserFormInfoCredentials';
+import { UserFormInfoMetaParameters } from './UserFormInfoMetaParameters';
+import type { UserFormInfoPart } from './UserFormInfoPart';
+import { UserFormInfoPartService } from './UserFormInfoPartService';
+import { UserFormInfoTeams } from './UserFormInfoTeams';
+
+export const UserFormInfo: TabContainerPanelComponent<UserFormProps> = observer(function UserFormInfo({ tabId, formState }) {
+  const translate = useTranslate();
+  const tab = useTab(tabId);
+  const tabState = useTabState<UserFormInfoPart>();
+  const userFormInfoPartService = useService(UserFormInfoPartService);
+
+  useAutoLoad(UserFormInfo, tabState, tab.selected);
+
+  const disabled = tabState.isLoading();
+  // let info: TLocalizationToken | null = null;
+
+  // if (formState.mode === FormMode.Edit && tabState.isChanged()) {
+  //   info = 'ui_save_reminder';
+  // }
+
+  return (
+    <ColoredContainer vertical gap overflow>
+      {/* {info && <InfoItem info={info} />} */}
+      <Container gap overflow>
+        <Group small gap vertical overflow>
+          <UserFormInfoCredentials formState={formState} tabState={tabState} tabSelected={tab.selected} disabled={disabled} />
+        </Group>
+        <Group small gap overflow>
+          <Placeholder container={userFormInfoPartService.placeholderContainer} formState={formState} />
+          <GroupTitle>{translate('authentication_user_status')}</GroupTitle>
+          <FieldCheckbox id={`${formState.id}_user_enabled`} name="enabled" state={tabState.state} disabled={disabled}>
+            {translate('authentication_user_enabled')}
+          </FieldCheckbox>
+          <UserFormInfoTeams formState={formState} tabState={tabState} tabSelected={tab.selected} disabled={disabled} />
+        </Group>
+        <UserFormInfoMetaParameters formState={formState} tabState={tabState} tabSelected={tab.selected} disabled={disabled} />
+      </Container>
+    </ColoredContainer>
+  );
+});
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoCredentials.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoCredentials.tsx
new file mode 100644
index 0000000000..1480c243d6
--- /dev/null
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoCredentials.tsx
@@ -0,0 +1,85 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { isLocalUser, UsersResource } from '@cloudbeaver/core-authentication';
+import { Container, GroupTitle, InputField, useCustomInputValidation, useResource, useTranslate } from '@cloudbeaver/core-blocks';
+import { FormMode } from '@cloudbeaver/core-ui';
+import { isValuesEqual } from '@cloudbeaver/core-utils';
+
+import type { UserFormProps } from '../AdministrationUserFormService';
+import type { UserFormInfoPart } from './UserFormInfoPart';
+
+const PASSWORD_PLACEHOLDER = '••••••';
+
+interface Props extends UserFormProps {
+  tabState: UserFormInfoPart;
+  tabSelected: boolean;
+  disabled: boolean;
+}
+
+export const UserFormInfoCredentials = observer<Props>(function UserFormInfoCredentials({ formState, tabState, tabSelected, disabled }) {
+  const translate = useTranslate();
+  const editing = formState.mode === FormMode.Edit;
+  const userInfo = useResource(
+    UserFormInfoCredentials,
+    UsersResource,
+    { key: tabState.initialState.userId, includes: ['includeMetaParameters'] },
+    { active: tabSelected && editing },
+  );
+  const local = !editing || (userInfo.data && isLocalUser(userInfo.data));
+
+  const passwordRepeatRef = useCustomInputValidation<string>(value => {
+    if (!isValuesEqual(value, tabState.state.password, null)) {
+      return translate('authentication_user_passwords_not_match');
+    }
+    return null;
+  });
+
+  return (
+    <Container gap vertical>
+      <GroupTitle keepSize>{translate('authentication_user_credentials')}</GroupTitle>
+      <InputField type="text" name="userId" state={tabState.state} readOnly={editing} disabled={disabled} mod="surface" keepSize tiny required>
+        {translate('authentication_user_name')}
+      </InputField>
+      {local && (
+        <>
+          <InputField
+            type="password"
+            name="password"
+            state={tabState.state}
+            autoComplete="new-password"
+            placeholder={editing ? PASSWORD_PLACEHOLDER : ''}
+            canShowPassword={tabState.state['password'] !== ''}
+            disabled={disabled}
+            mod="surface"
+            required={!editing}
+            keepSize
+            tiny
+          >
+            {translate('authentication_user_password')}
+          </InputField>
+          <InputField
+            ref={passwordRepeatRef}
+            type="password"
+            name="passwordRepeat"
+            placeholder={editing ? PASSWORD_PLACEHOLDER : ''}
+            disabled={disabled}
+            mod="surface"
+            required={!editing}
+            canShowPassword
+            keepSize
+            tiny
+          >
+            {translate('authentication_user_password_repeat')}
+          </InputField>
+        </>
+      )}
+    </Container>
+  );
+});
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoMetaParameters.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoMetaParameters.tsx
new file mode 100644
index 0000000000..e44d7940bf
--- /dev/null
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoMetaParameters.tsx
@@ -0,0 +1,36 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { UserMetaParametersResource } from '@cloudbeaver/core-authentication';
+import { Group, GroupTitle, ObjectPropertyInfoForm, useResource, useTranslate } from '@cloudbeaver/core-blocks';
+
+import type { UserFormProps } from '../AdministrationUserFormService';
+import type { UserFormInfoPart } from './UserFormInfoPart';
+
+interface Props extends UserFormProps {
+  tabState: UserFormInfoPart;
+  tabSelected: boolean;
+  disabled: boolean;
+}
+
+export const UserFormInfoMetaParameters = observer<Props>(function UserFormInfoMetaParameters({ tabState, tabSelected, disabled }) {
+  const translate = useTranslate();
+  const userMetaParameters = useResource(UserFormInfoMetaParameters, UserMetaParametersResource, undefined, { active: tabSelected });
+
+  if (userMetaParameters.data.length === 0) {
+    return null;
+  }
+
+  return (
+    <Group small gap vertical overflow>
+      <GroupTitle keepSize>{translate('authentication_user_meta_parameters')}</GroupTitle>
+      <ObjectPropertyInfoForm state={tabState.state.metaParameters} properties={userMetaParameters.data} disabled={disabled} keepSize tiny />
+    </Group>
+  );
+});
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
new file mode 100644
index 0000000000..6cce6658c8
--- /dev/null
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoPart.ts
@@ -0,0 +1,188 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 type { AdminUser, UsersResource } from '@cloudbeaver/core-authentication';
+import type { IExecutionContextProvider } from '@cloudbeaver/core-executor';
+import type { ServerConfigResource } from '@cloudbeaver/core-root';
+import { getCachedDataResourceLoaderState } from '@cloudbeaver/core-sdk';
+import { FormMode, FormPart, formValidationContext, IFormState } from '@cloudbeaver/core-ui';
+import { isArraysEqual, isDefined, isObjectsEqual, isValuesEqual } from '@cloudbeaver/core-utils';
+import { DATA_CONTEXT_LOADABLE_STATE } from '@cloudbeaver/core-view';
+
+import type { IUserFormState } from '../AdministrationUserFormService';
+import type { AdministrationUserFormState } from '../AdministrationUserFormState';
+import type { IUserFormInfoState } from './IUserFormInfoState';
+
+const DEFAULT_ENABLED = true;
+
+export class UserFormInfoPart extends FormPart<IUserFormInfoState, IUserFormState> {
+  constructor(
+    private readonly serverConfigResource: ServerConfigResource,
+    formState: AdministrationUserFormState,
+    private readonly usersResource: UsersResource,
+  ) {
+    super(formState, {
+      userId: formState.state.userId || '',
+      enabled: DEFAULT_ENABLED,
+      password: '',
+      metaParameters: {},
+      teams: [],
+    });
+  }
+
+  isOutdated(): boolean {
+    if (this.formState.mode === FormMode.Edit && this.initialState.userId) {
+      return this.usersResource.isOutdated(this.initialState.userId);
+    }
+
+    return false;
+  }
+
+  isLoaded(): boolean {
+    if (
+      this.formState.mode === FormMode.Edit &&
+      this.initialState.userId &&
+      !this.usersResource.isLoaded(this.initialState.userId, ['includeMetaParameters'])
+    ) {
+      return false;
+    }
+
+    return this.loaded;
+  }
+
+  isChanged(): boolean {
+    if (!this.loaded) {
+      return false;
+    }
+
+    return (
+      !isValuesEqual(this.state.userId, this.initialState.userId, null) ||
+      !isValuesEqual(this.state.enabled, this.initialState.enabled, null) ||
+      !isValuesEqual(this.state.password, this.initialState.password, null) ||
+      !isObjectsEqual(this.state.metaParameters, this.initialState.metaParameters) ||
+      !isArraysEqual(this.state.teams, this.initialState.teams)
+    );
+  }
+
+  protected override async saveChanges(): Promise<void> {
+    if (this.formState.mode === FormMode.Create) {
+      const user = await this.usersResource.create({
+        userId: this.state.userId,
+      });
+      this.initialState.userId = user.userId;
+      this.formState.setMode(FormMode.Edit);
+    }
+
+    // load actual data of user to prevent conflicts
+    await this.usersResource.refresh(this.state.userId);
+
+    await this.updateCredentials();
+    await this.updateTeams();
+    await this.updateStatus();
+    await this.updateMetaParameters();
+
+    this.usersResource.markOutdated(this.state.userId);
+  }
+
+  protected override validate(data: IFormState<IUserFormState>, contexts: IExecutionContextProvider<IFormState<IUserFormState>>) {
+    if (!this.loaded) {
+      return;
+    }
+
+    const validation = contexts.getContext(formValidationContext);
+
+    if (data.mode === FormMode.Create) {
+      if (!this.state.userId.trim()) {
+        validation.error('authentication_user_login_not_set');
+      }
+
+      if (!this.state.password) {
+        validation.error('authentication_user_password_not_set');
+      }
+    }
+  }
+  protected override configure() {
+    const loadableStateContext = this.formState.dataContext.get(DATA_CONTEXT_LOADABLE_STATE);
+
+    loadableStateContext.getState('user-info', () => [getCachedDataResourceLoaderState(this.serverConfigResource, undefined)]);
+  }
+
+  private async updateCredentials() {
+    if (this.state.password) {
+      await this.usersResource.updateCredentials(this.state.userId, {
+        profile: '0',
+        credentials: { password: this.state.password },
+      });
+    }
+  }
+
+  private async updateTeams() {
+    let grantedTeams: string[] = [];
+
+    if (this.state.userId) {
+      grantedTeams = this.usersResource.get(this.state.userId)?.grantedTeams ?? [];
+    }
+
+    if (isArraysEqual(this.state.teams, grantedTeams)) {
+      return;
+    }
+
+    const revokeTeams = grantedTeams.filter(teamId => !this.state.teams.includes(teamId)) ?? [];
+    const grantTeams = this.state.teams.filter(teamId => !grantedTeams.includes(teamId));
+
+    for (const teamId of revokeTeams) {
+      await this.usersResource.revokeTeam(this.state.userId, teamId, true);
+    }
+
+    for (const teamId of grantTeams) {
+      await this.usersResource.grantTeam(this.state.userId, teamId, true);
+    }
+  }
+
+  private async updateStatus() {
+    let enabled = false;
+
+    if (this.state.userId) {
+      enabled = this.usersResource.get(this.state.userId)?.enabled ?? false;
+    }
+
+    if (this.state.enabled !== enabled) {
+      await this.usersResource.enableUser(this.state.userId, this.state.enabled, true);
+    }
+  }
+
+  private async updateMetaParameters() {
+    if (this.state.userId) {
+      const user = this.usersResource.get(this.state.userId);
+
+      if (user && isObjectsEqual(user.metaParameters, this.state.metaParameters)) {
+        return;
+      }
+    }
+
+    await this.usersResource.setMetaParameters(this.state.userId, this.state.metaParameters);
+  }
+
+  protected override async loader() {
+    let user: AdminUser | null = null;
+    const serverConfig = await this.serverConfigResource.load();
+
+    if (this.formState.mode === FormMode.Edit && this.initialState.userId) {
+      user = await this.usersResource.load(this.initialState.userId, ['includeMetaParameters']);
+    }
+
+    this.setInitialState({
+      userId: user?.userId || this.formState.state.userId || '',
+      enabled: user?.enabled || DEFAULT_ENABLED,
+      metaParameters: observable(user?.metaParameters || {}),
+      teams: observable(user?.grantedTeams || [serverConfig?.defaultUserTeam].filter(isDefined)),
+      password: '',
+    });
+  }
+}
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoPartBootstrap.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoPartBootstrap.ts
new file mode 100644
index 0000000000..4cf8ed39b8
--- /dev/null
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoPartBootstrap.ts
@@ -0,0 +1,38 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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';
+
+import { Bootstrap, injectable } from '@cloudbeaver/core-di';
+
+import { AdministrationUserFormService } from '../AdministrationUserFormService';
+import { DATA_CONTEXT_USER_FORM_INFO_PART } from './DATA_CONTEXT_USER_FORM_INFO_PART';
+
+const UserFormInfo = React.lazy(async () => {
+  const { UserFormInfo } = await import('./UserFormInfo');
+  return { default: UserFormInfo };
+});
+
+@injectable()
+export class UserFormInfoPartBootstrap extends Bootstrap {
+  constructor(private readonly administrationUserFormService: AdministrationUserFormService) {
+    super();
+  }
+
+  register(): void {
+    this.administrationUserFormService.parts.add({
+      key: 'info',
+      name: 'authentication_administration_user_info',
+      title: 'authentication_administration_user_info',
+      order: 1,
+      panel: () => UserFormInfo,
+      stateGetter: props => () => props.formState.dataContext.get(DATA_CONTEXT_USER_FORM_INFO_PART),
+    });
+  }
+
+  load(): void {}
+}
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoPartService.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoPartService.ts
new file mode 100644
index 0000000000..5f3c10c109
--- /dev/null
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoPartService.ts
@@ -0,0 +1,19 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { PlaceholderContainer } from '@cloudbeaver/core-blocks';
+import { injectable } from '@cloudbeaver/core-di';
+
+import type { UserFormProps } from '../AdministrationUserFormService';
+
+@injectable()
+export class UserFormInfoPartService {
+  placeholderContainer: PlaceholderContainer<UserFormProps>;
+  constructor() {
+    this.placeholderContainer = new PlaceholderContainer();
+  }
+}
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoTeams.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoTeams.tsx
new file mode 100644
index 0000000000..808daa2dc2
--- /dev/null
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoTeams.tsx
@@ -0,0 +1,52 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { compareTeams, TeamsResource } from '@cloudbeaver/core-authentication';
+import { FieldCheckbox, Group, GroupTitle, useResource, useTranslate } from '@cloudbeaver/core-blocks';
+import { CachedMapAllKey } from '@cloudbeaver/core-sdk';
+import { isDefined } from '@cloudbeaver/core-utils';
+
+import type { UserFormProps } from '../AdministrationUserFormService';
+import type { UserFormInfoPart } from './UserFormInfoPart';
+
+interface Props extends UserFormProps {
+  tabState: UserFormInfoPart;
+  tabSelected: boolean;
+  disabled: boolean;
+}
+
+export const UserFormInfoTeams = observer<Props>(function UserFormInfoTeams({ formState, tabState, tabSelected, disabled }) {
+  const translate = useTranslate();
+  const teamsLoader = useResource(UserFormInfoTeams, TeamsResource, CachedMapAllKey, { active: tabSelected });
+  const teams = teamsLoader.data.filter(isDefined).sort(compareTeams);
+  return (
+    <>
+      <GroupTitle>{translate('authentication_user_team')}</GroupTitle>
+      <Group boxNoOverflow gap dense>
+        {teams.map(team => {
+          const label = `${team.teamId}${team.teamName && team.teamName !== team.teamId ? ' (' + team.teamName + ')' : ''}`;
+          const tooltip = `${label}${team.description ? '\n' + team.description : ''}`;
+          return (
+            <FieldCheckbox
+              key={team.teamId}
+              id={`${formState.id}_${team.teamId}`}
+              title={tooltip}
+              name="teams"
+              state={tabState.state}
+              value={team.teamId}
+              disabled={disabled}
+            >
+              {label}
+            </FieldCheckbox>
+          );
+        })}
+      </Group>
+    </>
+  );
+});
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/OriginInfoPanel.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Origin/UserFormOriginInfoPanel.tsx
similarity index 65%
rename from webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/OriginInfoPanel.tsx
rename to webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Origin/UserFormOriginInfoPanel.tsx
index 0802aacc92..b65cf39d5d 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/OriginInfoPanel.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Origin/UserFormOriginInfoPanel.tsx
@@ -18,18 +18,19 @@ import {
   TextPlaceholder,
   useAutoLoad,
   useObjectRef,
+  useResource,
   useTranslate,
 } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import type { AdminUserInfo, ObjectPropertyInfo } from '@cloudbeaver/core-sdk';
-import { TabContainerPanelComponent, useTab, useTabState } from '@cloudbeaver/core-ui';
+import { FormMode, TabContainerPanelComponent, useTab, useTabState } from '@cloudbeaver/core-ui';
 
-import { getOriginTabId } from './getOriginTabId';
-import type { IUserFormProps } from './UserFormService';
+import type { UserFormProps } from '../AdministrationUserFormService';
+import { getUserFormOriginTabId } from './getUserFormOriginTabId';
 
 interface IInnerState extends IAutoLoadable {
   state: IState;
-  user: AdminUserInfo;
+  user: AdminUserInfo | undefined;
 }
 
 interface IState {
@@ -40,10 +41,13 @@ interface IState {
   exception: Error | null;
 }
 
-export const OriginInfoPanel: TabContainerPanelComponent<IUserFormProps> = observer(function OriginInfoPanel({ tabId, user }) {
+export const UserFormOriginInfoPanel: TabContainerPanelComponent<UserFormProps> = observer(function UserFormOriginInfoPanel({
+  tabId,
+  formState: { mode, state },
+}) {
   const translate = useTranslate();
   const usersResource = useService(UsersResource);
-  const state = useTabState<IState>(() => ({
+  const localState = useTabState<IState>(() => ({
     origin: null,
     properties: [],
     state: {},
@@ -51,11 +55,12 @@ export const OriginInfoPanel: TabContainerPanelComponent<IUserFormProps> = obser
     loaded: false,
     exception: null,
   }));
-
-  let origin = user.origins.find(origin => getOriginTabId('origin', origin) === tabId);
+  const editing = mode === FormMode.Edit;
+  const userInfo = useResource(UserFormOriginInfoPanel, UsersResource, state.userId, { active: editing });
+  let origin = userInfo.data?.origins.find(origin => getUserFormOriginTabId('origin', origin) === tabId);
 
   if (!origin) {
-    origin = user.origins[0];
+    origin = userInfo.data?.origins[0];
   }
 
   const loadableState = useObjectRef<IInnerState>(
@@ -63,6 +68,9 @@ export const OriginInfoPanel: TabContainerPanelComponent<IUserFormProps> = obser
       get exception(): Error | null {
         return this.state.exception;
       },
+      isError(): boolean {
+        return !!this.state.exception;
+      },
       isLoaded(): boolean {
         return this.state.loaded;
       },
@@ -70,7 +78,7 @@ export const OriginInfoPanel: TabContainerPanelComponent<IUserFormProps> = obser
         return this.state.loading;
       },
       async load(reload = false) {
-        if ((this.state.loaded && !reload) || this.state.loading) {
+        if ((this.state.loaded && !reload) || this.state.loading || !this.user) {
           return;
         }
 
@@ -81,10 +89,10 @@ export const OriginInfoPanel: TabContainerPanelComponent<IUserFormProps> = obser
           usersResource.markOutdated(this.user.userId);
           const userOrigin = await usersResource.load(this.user.userId, ['customIncludeOriginDetails']);
 
-          let origin = userOrigin.origins.find(origin => getOriginTabId('origin', origin) === tabId);
+          let origin = userOrigin.origins.find(origin => getUserFormOriginTabId('origin', origin) === tabId);
 
           if (!origin) {
-            origin = user.origins[0];
+            origin = this.user.origins[0];
           }
 
           const propertiesState = {} as Record<string, any>;
@@ -106,21 +114,21 @@ export const OriginInfoPanel: TabContainerPanelComponent<IUserFormProps> = obser
       },
     }),
     {
-      state,
-      user,
+      state: localState,
+      user: userInfo.data as AdminUserInfo | undefined,
     },
-    ['reload', 'load', 'isLoaded', 'isLoading'],
+    ['reload', 'load', 'isLoaded', 'isLoading', 'isError'],
   );
 
   const { selected } = useTab(tabId);
 
-  useAutoLoad(OriginInfoPanel, loadableState, selected);
+  useAutoLoad(UserFormOriginInfoPanel, loadableState, selected);
 
   if (!selected) {
     return null;
   }
 
-  if (state.loading) {
+  if (localState.loading) {
     return (
       <ColoredContainer parent>
         <Group large>
@@ -130,17 +138,17 @@ export const OriginInfoPanel: TabContainerPanelComponent<IUserFormProps> = obser
     );
   }
 
-  if (state.exception) {
+  if (localState.exception) {
     return (
       <ColoredContainer parent>
         <Group large>
-          <ExceptionMessage exception={state.exception} onRetry={() => loadableState.reload?.()} />
+          <ExceptionMessage exception={localState.exception} onRetry={() => loadableState.reload?.()} />
         </Group>
       </ColoredContainer>
     );
   }
 
-  if (!origin || (state.loaded && state.properties.length === 0)) {
+  if (!origin || (localState.loaded && localState.properties.length === 0)) {
     return (
       <ColoredContainer parent>
         <Group large>
@@ -151,9 +159,9 @@ export const OriginInfoPanel: TabContainerPanelComponent<IUserFormProps> = obser
   }
 
   return (
-    <ColoredContainer parent>
+    <ColoredContainer>
       <Group gap large>
-        <ObjectPropertyInfoForm properties={state.properties} state={state.state} readOnly small autoHide />
+        <ObjectPropertyInfoForm properties={localState.properties} state={localState.state} readOnly small autoHide />
       </Group>
     </ColoredContainer>
   );
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Origin/UserFormOriginInfoTab.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Origin/UserFormOriginInfoTab.tsx
new file mode 100644
index 0000000000..a58a6d0ccd
--- /dev/null
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Origin/UserFormOriginInfoTab.tsx
@@ -0,0 +1,34 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 styled from 'reshadow';
+
+import { UsersResource } from '@cloudbeaver/core-authentication';
+import { Translate, useResource, useStyles } from '@cloudbeaver/core-blocks';
+import { FormMode, Tab, TabContainerTabComponent, TabTitle } from '@cloudbeaver/core-ui';
+
+import type { UserFormProps } from '../AdministrationUserFormService';
+import { getUserFormOriginTabId } from './getUserFormOriginTabId';
+
+export const UserFormOriginInfoTab: TabContainerTabComponent<UserFormProps> = observer(function UserFormOriginInfoTab({
+  tabId,
+  formState: { mode, state },
+  style,
+  ...rest
+}) {
+  const editing = mode === FormMode.Edit;
+  const userInfo = useResource(UserFormOriginInfoTab, UsersResource, state.userId, { active: editing });
+  const origin = userInfo.data?.origins.find(origin => getUserFormOriginTabId('origin', origin) === tabId);
+  return styled(useStyles(style))(
+    <Tab {...rest} tabId={tabId} style={style}>
+      <TabTitle>
+        <Translate token={origin?.displayName || 'Origin'} />
+      </TabTitle>
+    </Tab>,
+  );
+});
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Origin/UserFormOriginPartBootstrap.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Origin/UserFormOriginPartBootstrap.ts
new file mode 100644
index 0000000000..8db233749a
--- /dev/null
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Origin/UserFormOriginPartBootstrap.ts
@@ -0,0 +1,65 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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';
+
+import { AUTH_PROVIDER_LOCAL_ID, UsersResource } from '@cloudbeaver/core-authentication';
+import { Bootstrap, injectable } from '@cloudbeaver/core-di';
+import { FormMode } from '@cloudbeaver/core-ui';
+
+import { AdministrationUserFormService } from '../AdministrationUserFormService';
+import { DATA_CONTEXT_USER_FORM_INFO_PART } from '../Info/DATA_CONTEXT_USER_FORM_INFO_PART';
+import { getUserFormOriginTabId } from './getUserFormOriginTabId';
+
+const UserFormOriginInfoPanel = React.lazy(async () => {
+  const { UserFormOriginInfoPanel } = await import('./UserFormOriginInfoPanel');
+  return { default: UserFormOriginInfoPanel };
+});
+
+const UserFormOriginInfoTab = React.lazy(async () => {
+  const { UserFormOriginInfoTab } = await import('./UserFormOriginInfoTab');
+  return { default: UserFormOriginInfoTab };
+});
+
+@injectable()
+export class UserFormOriginPartBootstrap extends Bootstrap {
+  constructor(private readonly administrationUserFormService: AdministrationUserFormService, private readonly usersResource: UsersResource) {
+    super();
+  }
+
+  register(): void {
+    this.administrationUserFormService.parts.add({
+      key: 'origin',
+      order: 2,
+      generator: (tabId, props) => {
+        const userFormInfoPart = props?.formState.dataContext.get(DATA_CONTEXT_USER_FORM_INFO_PART);
+        if (props?.formState?.mode === FormMode.Edit && userFormInfoPart?.initialState.userId) {
+          const user = this.usersResource.get(userFormInfoPart.initialState.userId);
+          const origins = user?.origins.filter(origin => origin.type !== AUTH_PROVIDER_LOCAL_ID);
+
+          if (origins && origins.length > 0) {
+            return origins.map(origin => getUserFormOriginTabId(tabId, origin));
+          }
+        }
+
+        return ['origin'];
+      },
+      isHidden: (tabId, props) => {
+        const userFormInfoPart = props?.formState.dataContext.get(DATA_CONTEXT_USER_FORM_INFO_PART);
+        if (props?.formState?.mode === FormMode.Edit && userFormInfoPart?.initialState.userId) {
+          const user = this.usersResource.get(userFormInfoPart.initialState.userId);
+          return !user?.origins.some(origin => origin.type !== AUTH_PROVIDER_LOCAL_ID);
+        }
+        return true;
+      },
+      panel: () => UserFormOriginInfoPanel,
+      tab: () => UserFormOriginInfoTab,
+    });
+  }
+
+  load(): void {}
+}
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/getOriginTabId.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Origin/getUserFormOriginTabId.ts
similarity index 81%
rename from webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/getOriginTabId.ts
rename to webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Origin/getUserFormOriginTabId.ts
index e953239287..683f43bf56 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/getOriginTabId.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Origin/getUserFormOriginTabId.ts
@@ -7,6 +7,6 @@
  */
 import type { ObjectOrigin } from '@cloudbeaver/core-sdk';
 
-export function getOriginTabId(tabId: string, origin: ObjectOrigin) {
+export function getUserFormOriginTabId(tabId: string, origin: ObjectOrigin) {
   return `${tabId}_${origin.type}_${origin.subType}`;
 }
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/OriginInfoTab.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/OriginInfoTab.tsx
deleted file mode 100644
index 2dea5f16d3..0000000000
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/OriginInfoTab.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2023 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 styled from 'reshadow';
-
-import { Translate, useStyles } from '@cloudbeaver/core-blocks';
-import { Tab, TabContainerTabComponent, TabTitle } from '@cloudbeaver/core-ui';
-
-import { getOriginTabId } from './getOriginTabId';
-import type { IUserFormProps } from './UserFormService';
-
-export const OriginInfoTab: TabContainerTabComponent<IUserFormProps> = observer(function OriginInfoTab({
-  tabId,
-  user,
-  controller,
-  editing,
-  style,
-  ...rest
-}) {
-  const origin = user.origins.find(origin => getOriginTabId('origin', origin) === tabId);
-  return styled(useStyles(style))(
-    <Tab {...rest} tabId={tabId} style={style}>
-      <TabTitle>
-        <Translate token={origin?.displayName || 'Origin'} />
-      </TabTitle>
-    </Tab>,
-  );
-});
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserForm.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserForm.tsx
deleted file mode 100644
index 73b413b565..0000000000
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserForm.tsx
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2023 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 { useEffect } from 'react';
-import styled, { css } from 'reshadow';
-
-import { Button, Loader, StatusMessage, SubmittingForm, useFocus, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
-import { useController, useService } from '@cloudbeaver/core-di';
-import type { AdminUserInfo } from '@cloudbeaver/core-sdk';
-import { BASE_TAB_STYLES, TabList, TabPanelList, TabsState, UNDERLINE_TAB_BIG_STYLES, UNDERLINE_TAB_STYLES } from '@cloudbeaver/core-ui';
-
-import { UserFormController } from './UserFormController';
-import { UserFormService } from './UserFormService';
-
-const tabsStyles = css`
-  TabList {
-    position: relative;
-    flex-shrink: 0;
-    align-items: center;
-  }
-`;
-
-const formStyles = css`
-  FormBox {
-    composes: theme-background-secondary theme-text-on-secondary from global;
-  }
-  box {
-    display: flex;
-    flex-direction: column;
-    flex: 1;
-    height: 100%;
-    overflow: auto;
-  }
-  content-box {
-    composes: theme-background-secondary theme-text-on-secondary theme-border-color-background from global;
-    display: flex;
-    flex: 1;
-    flex-direction: column;
-    overflow: auto;
-  }
-  SubmittingForm {
-    flex: 1;
-    overflow: auto;
-    display: flex;
-    flex-direction: column;
-  }
-`;
-
-const topBarStyles = css`
-  connection-top-bar {
-    composes: theme-border-color-background theme-background-secondary theme-text-on-secondary from global;
-    position: relative;
-    display: flex;
-    padding-top: 16px;
-    margin-bottom: 24px;
-
-    &:before {
-      content: '';
-      position: absolute;
-      bottom: 0;
-      width: 100%;
-      border-bottom: solid 2px;
-      border-color: inherit;
-    }
-  }
-  connection-top-bar-tabs {
-    overflow: hidden;
-    flex: 1;
-  }
-  StatusMessage {
-    padding: 0 16px;
-  }
-  connection-top-bar-actions {
-    display: flex;
-    align-items: center;
-    padding: 0 24px;
-    gap: 16px;
-  }
-`;
-
-interface Props {
-  user: AdminUserInfo;
-  editing?: boolean;
-  onCancel: () => void;
-}
-
-export const UserForm = observer<Props>(function UserForm({ user, editing = false, onCancel }) {
-  const style = [BASE_TAB_STYLES, tabsStyles, UNDERLINE_TAB_STYLES, UNDERLINE_TAB_BIG_STYLES];
-  const styles = useStyles(style, topBarStyles, formStyles);
-  const translate = useTranslate();
-  const service = useService(UserFormService);
-  const controller = useController(UserFormController);
-  const [focusedRef] = useFocus<HTMLFormElement>({ focusFirstChild: true });
-
-  useEffect(() => {
-    controller.update(user, editing, onCancel);
-  });
-
-  return styled(styles)(
-    <TabsState localState={controller.partsState} container={service.tabsContainer} user={user} controller={controller} editing={editing}>
-      <box>
-        <connection-top-bar>
-          <connection-top-bar-tabs>
-            <StatusMessage
-              status={controller.statusMessage?.status}
-              message={controller.statusMessage?.message}
-              onShowDetails={controller.error.hasDetails ? controller.showDetails : undefined}
-            />
-            <TabList style={style} />
-          </connection-top-bar-tabs>
-          <connection-top-bar-actions>
-            <Button type="button" disabled={controller.isSaving} mod={['outlined']} onClick={onCancel}>
-              {translate('ui_processing_cancel')}
-            </Button>
-            <Button type="button" disabled={controller.isSaving} mod={['unelevated']} onClick={controller.save}>
-              {translate(!editing ? 'ui_processing_create' : 'ui_processing_save')}
-            </Button>
-          </connection-top-bar-actions>
-        </connection-top-bar>
-        <content-box>
-          <SubmittingForm ref={focusedRef}>
-            <Loader loading={controller.isLoading || !controller.configured}>
-              <TabPanelList style={style} />
-            </Loader>
-          </SubmittingForm>
-        </content-box>
-      </box>
-    </TabsState>,
-  );
-});
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserFormBaseBootstrap.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserFormBaseBootstrap.ts
index eb0916abf9..d8389abc61 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserFormBaseBootstrap.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserFormBaseBootstrap.ts
@@ -5,58 +5,15 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-import React from 'react';
-
-import { AUTH_PROVIDER_LOCAL_ID } from '@cloudbeaver/core-authentication';
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 
-import { getOriginTabId } from './getOriginTabId';
-import { UserFormService } from './UserFormService';
-
-const OriginInfoPanel = React.lazy(async () => {
-  const { OriginInfoPanel } = await import('./OriginInfoPanel');
-  return { default: OriginInfoPanel };
-});
-const OriginInfoTab = React.lazy(async () => {
-  const { OriginInfoTab } = await import('./OriginInfoTab');
-  return { default: OriginInfoTab };
-});
-const UserInfo = React.lazy(async () => {
-  const { UserInfo } = await import('./UserInfo');
-  return { default: UserInfo };
-});
-
 @injectable()
 export class UserFormBaseBootstrap extends Bootstrap {
-  constructor(private readonly userFormService: UserFormService) {
+  constructor() {
     super();
   }
 
-  register(): void | Promise<void> {
-    this.userFormService.tabsContainer.add({
-      key: 'info',
-      name: 'authentication_administration_user_info',
-      title: 'authentication_administration_user_info',
-      order: 1,
-      panel: () => UserInfo,
-    });
-    this.userFormService.tabsContainer.add({
-      key: 'origin',
-      order: 2,
-      generator: (tabId, props) => {
-        const origins = props?.user.origins.filter(origin => origin.type !== AUTH_PROVIDER_LOCAL_ID);
-
-        if (origins && origins.length > 0) {
-          return origins.map(origin => getOriginTabId(tabId, origin));
-        }
-
-        return ['origin'];
-      },
-      isHidden: (tabId, props) => !props?.user.origins.some(origin => origin.type !== AUTH_PROVIDER_LOCAL_ID),
-      panel: () => OriginInfoPanel,
-      tab: () => OriginInfoTab,
-    });
-  }
+  register(): void | Promise<void> {}
 
   load(): void | Promise<void> {}
 }
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserFormController.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserFormController.ts
deleted file mode 100644
index acb81bb6c9..0000000000
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserFormController.ts
+++ /dev/null
@@ -1,387 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2023 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 { computed, makeObservable, observable, toJS } from 'mobx';
-
-import { AdminUser, AuthRolesResource, compareTeams, isLocalUser, TeamInfo, TeamsResource, UsersResource } from '@cloudbeaver/core-authentication';
-import {
-  compareConnectionsInfo,
-  ConnectionInfoProjectKey,
-  ConnectionInfoResource,
-  DatabaseConnection,
-  DBDriverResource,
-} from '@cloudbeaver/core-connections';
-import { IDestructibleController, IInitializableController, injectable } from '@cloudbeaver/core-di';
-import { CommonDialogService } from '@cloudbeaver/core-dialogs';
-import { ENotificationType, NotificationService } from '@cloudbeaver/core-events';
-import { Executor, ExecutorInterrupter } from '@cloudbeaver/core-executor';
-import type { TLocalizationToken } from '@cloudbeaver/core-localization';
-import { ErrorDetailsDialog } from '@cloudbeaver/core-notifications';
-import { isGlobalProject, ProjectInfoResource } from '@cloudbeaver/core-projects';
-import { AdminConnectionGrantInfo, AdminSubjectType, AdminUserInfo, CachedMapAllKey, GQLErrorCatcher } from '@cloudbeaver/core-sdk';
-import { MetadataMap } from '@cloudbeaver/core-utils';
-
-import { IUserFormState, UserFormService } from './UserFormService';
-
-interface IStatusMessage {
-  status: ENotificationType;
-  message: TLocalizationToken;
-}
-
-interface IUserCredentials {
-  login: string;
-  password: string;
-  passwordRepeat: string;
-  metaParameters: Record<string, any>;
-  teams: Map<string, boolean>;
-  authRole?: string;
-}
-
-@injectable()
-export class UserFormController implements IInitializableController, IDestructibleController {
-  readonly selectedConnections: Map<string, boolean>;
-
-  grantedConnections: AdminConnectionGrantInfo[];
-  isSaving: boolean;
-  isLoading: boolean;
-  credentials: IUserCredentials;
-  enabled: boolean;
-  statusMessage: IStatusMessage | null;
-  partsState: MetadataMap<string, any>;
-  configured: boolean;
-
-  get connections(): DatabaseConnection[] {
-    return this.connectionInfoResource.values
-      .filter(({ projectId }) => isGlobalProject(this.projectInfoResource.get(projectId)))
-      .sort(compareConnectionsInfo);
-  }
-
-  get teams(): TeamInfo[] {
-    return this.teamsResource.values.slice().sort(compareTeams);
-  }
-
-  get local(): boolean {
-    return isLocalUser(this.user);
-  }
-
-  user!: AdminUserInfo;
-
-  readonly error: GQLErrorCatcher;
-
-  readonly afterSubmitTask: Executor<IUserFormState>;
-  private isDestructed: boolean;
-  private connectionAccessChanged: boolean;
-  private connectionAccessLoaded: boolean;
-  private collapse!: () => void;
-  private editing!: boolean;
-
-  constructor(
-    private readonly projectInfoResource: ProjectInfoResource,
-    private readonly notificationService: NotificationService,
-    private readonly commonDialogService: CommonDialogService,
-    private readonly teamsResource: TeamsResource,
-    private readonly usersResource: UsersResource,
-    private readonly connectionInfoResource: ConnectionInfoResource,
-    private readonly authRolesResource: AuthRolesResource,
-    private readonly dbDriverResource: DBDriverResource,
-    private readonly userFormService: UserFormService,
-  ) {
-    this.partsState = new MetadataMap();
-    this.afterSubmitTask = new Executor();
-    this.selectedConnections = new Map();
-    this.grantedConnections = [];
-    this.isSaving = false;
-    this.isLoading = false;
-    this.credentials = {
-      login: '',
-      password: '',
-      passwordRepeat: '',
-      metaParameters: {},
-      teams: new Map(),
-    };
-    this.enabled = true;
-    this.error = new GQLErrorCatcher();
-    this.isDestructed = false;
-    this.connectionAccessChanged = false;
-    this.connectionAccessLoaded = false;
-    this.statusMessage = null;
-    this.configured = false;
-
-    makeObservable(this, {
-      selectedConnections: observable,
-      grantedConnections: observable,
-      isSaving: observable,
-      isLoading: observable,
-      credentials: observable,
-      enabled: observable.ref,
-      configured: observable.ref,
-      statusMessage: observable,
-      connections: computed,
-      teams: computed,
-    });
-  }
-
-  async init(): Promise<void> {
-    await this.userFormService.onFormInit.execute();
-    this.configured = true;
-  }
-
-  async update(user: AdminUserInfo, editing: boolean, collapse: () => void): Promise<void> {
-    const prevUser = this.user;
-    this.user = user;
-    this.editing = editing;
-    this.collapse = collapse;
-    if (prevUser !== this.user) {
-      await this.loadTeams();
-    }
-  }
-
-  destruct(): void {
-    this.isDestructed = true;
-  }
-
-  save = async () => {
-    if (this.isSaving) {
-      return;
-    }
-    if (!this.validate()) {
-      return;
-    }
-
-    this.isSaving = true;
-    try {
-      let user: AdminUser;
-      if (!this.editing) {
-        user = await this.usersResource.create({
-          userId: this.credentials.login,
-          credentials: {
-            profile: '0',
-            credentials: { password: this.credentials.password },
-          },
-          enabled: this.enabled,
-          teams: this.getGrantedTeams(),
-          metaParameters: this.credentials.metaParameters,
-          grantedConnections: this.getGrantedConnections(),
-          authRole: this.credentials.authRole,
-        });
-
-        this.collapse();
-        this.notificationService.logSuccess({ title: 'authentication_administration_user_created' });
-      } else {
-        if (this.credentials.password) {
-          await this.usersResource.updateCredentials(this.user.userId, {
-            profile: '0',
-            credentials: { password: this.credentials.password },
-          });
-        }
-        await this.updateTeams();
-        await this.saveUserRole();
-        await this.saveUserStatus();
-        await this.saveConnectionPermissions();
-        await this.saveMetaParameters();
-        user = await this.usersResource.refresh(this.user.userId, ['includeMetaParameters']);
-
-        this.notificationService.logSuccess({ title: 'authentication_administration_user_updated' });
-      }
-
-      const context = await this.afterSubmitTask.execute({
-        user,
-        partsState: this.partsState,
-        props: {
-          controller: this,
-          user: this.user,
-          editing: this.editing,
-        },
-      });
-
-      if (ExecutorInterrupter.isInterrupted(context)) {
-        return;
-      }
-
-      this.error.clear();
-      this.statusMessage = null;
-    } catch (exception: any) {
-      this.error.catch(exception);
-      const title = this.editing ? 'authentication_administration_user_update_failed' : 'authentication_administration_user_create_failed';
-
-      if (this.isDestructed) {
-        this.notificationService.logException(exception, title);
-        return;
-      }
-
-      this.setStatusMessage(this.error.responseMessage || exception.message || title, ENotificationType.Error);
-    } finally {
-      this.isSaving = false;
-    }
-  };
-
-  showDetails = () => {
-    if (this.error.exception) {
-      this.commonDialogService.open(ErrorDetailsDialog, this.error.exception);
-    }
-  };
-
-  handleConnectionsAccessChange = () => {
-    this.connectionAccessChanged = true;
-  };
-
-  loadConnectionsAccess = async () => {
-    if (this.isLoading || this.connectionAccessLoaded) {
-      return;
-    }
-
-    this.isLoading = true;
-    try {
-      if (this.editing) {
-        this.grantedConnections = await this.usersResource.loadConnections(this.user.userId);
-
-        this.selectedConnections.clear();
-        for (const connection of this.grantedConnections) {
-          if (connection.subjectType !== AdminSubjectType.Team) {
-            this.selectedConnections.set(connection.dataSourceId, true);
-          }
-        }
-      }
-      this.connectionAccessLoaded = true;
-    } catch (exception: any) {
-      this.setStatusMessage('authentication_administration_user_connections_access_load_fail', ENotificationType.Error);
-    }
-    await this.loadConnections();
-    this.isLoading = false;
-  };
-
-  private setStatusMessage(message: TLocalizationToken, status: ENotificationType) {
-    this.statusMessage = {
-      message,
-      status,
-    };
-  }
-
-  private validate() {
-    if (!this.editing) {
-      if (!this.credentials.login.trim()) {
-        this.setStatusMessage('authentication_user_login_not_set', ENotificationType.Error);
-        return;
-      }
-
-      if (this.teamsResource.has(this.credentials.login)) {
-        this.setStatusMessage('authentication_user_login_cant_be_used', ENotificationType.Error);
-        return;
-      }
-
-      if (this.usersResource.has(this.credentials.login)) {
-        this.setStatusMessage('authentication_user_login_already_exists', ENotificationType.Error);
-        return;
-      }
-    }
-
-    if (!this.credentials.authRole && this.authRolesResource.data.length > 0) {
-      this.setStatusMessage('authentication_user_role_not_set', ENotificationType.Error);
-      return;
-    }
-
-    if (!this.credentials.password && !this.editing) {
-      this.setStatusMessage('authentication_user_password_not_set', ENotificationType.Error);
-      return;
-    }
-
-    if (this.credentials.password !== this.credentials.passwordRepeat) {
-      this.setStatusMessage('authentication_user_passwords_not_match', ENotificationType.Error);
-      return;
-    }
-
-    return true;
-  }
-
-  private async updateTeams() {
-    for (const [teamId, checked] of this.credentials.teams) {
-      if (checked) {
-        if (!this.user.grantedTeams.includes(teamId)) {
-          await this.usersResource.grantTeam(this.user.userId, teamId, true);
-        }
-      } else {
-        if (this.user.grantedTeams.includes(teamId)) {
-          await this.usersResource.revokeTeam(this.user.userId, teamId, true);
-        }
-      }
-    }
-  }
-
-  private getGrantedTeams() {
-    return Array.from(this.credentials.teams.keys()).filter(teamId => this.credentials.teams.get(teamId));
-  }
-
-  private getGrantedConnections() {
-    return Array.from(this.selectedConnections.keys()).filter(connectionId => {
-      const connectionPermission = this.grantedConnections.find(connectionPermission => connectionPermission.dataSourceId === connectionId);
-      return this.selectedConnections.get(connectionId) && connectionPermission?.subjectType !== AdminSubjectType.Team;
-    });
-  }
-
-  private async saveMetaParameters() {
-    await this.usersResource.setMetaParameters(this.user.userId, this.credentials.metaParameters);
-  }
-
-  private async saveUserRole() {
-    if (this.credentials.authRole !== this.user.authRole) {
-      await this.usersResource.setAuthRole(this.user.userId, this.credentials.authRole, true);
-    }
-  }
-
-  private async saveUserStatus() {
-    if (this.enabled !== this.user.enabled) {
-      await this.usersResource.enableUser(this.user.userId, this.enabled, true);
-    }
-  }
-
-  private async saveConnectionPermissions() {
-    await this.projectInfoResource.load(CachedMapAllKey);
-
-    if (!this.connectionAccessChanged || !this.projectInfoResource.values.some(isGlobalProject)) {
-      return;
-    }
-    await this.usersResource.setConnections(this.user.userId, this.getGrantedConnections());
-    this.connectionAccessChanged = false;
-    this.connectionAccessLoaded = false;
-    await this.loadConnectionsAccess();
-  }
-
-  private async loadTeams() {
-    try {
-      this.isLoading = true;
-      await this.teamsResource.load(CachedMapAllKey);
-      await this.loadUser();
-    } catch (exception: any) {
-      this.notificationService.logException(exception, "Can't load teams");
-    } finally {
-      this.isLoading = false;
-    }
-  }
-
-  private async loadUser() {
-    try {
-      this.credentials.metaParameters = observable(toJS(this.user.metaParameters ?? {}));
-      this.credentials.login = this.user.userId;
-      this.credentials.teams = new Map(this.user.grantedTeams.map(teamId => [teamId, true]));
-      this.credentials.authRole = this.user.authRole;
-      this.enabled = this.user.enabled;
-    } catch (exception: any) {
-      this.notificationService.logException(exception, "Can't load user");
-    }
-  }
-
-  private async loadConnections() {
-    try {
-      await this.dbDriverResource.load(CachedMapAllKey);
-      const projects = await this.projectInfoResource.load(CachedMapAllKey);
-
-      await this.connectionInfoResource.load(ConnectionInfoProjectKey(...projects.filter(isGlobalProject).map(project => project.id)));
-    } catch (exception: any) {
-      this.setStatusMessage('authentication_administration_user_connections_access_connections_load_fail', ENotificationType.Error);
-    }
-  }
-}
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserFormService.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserFormService.ts
deleted file mode 100644
index 7233793cb6..0000000000
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserFormService.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2023 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 { AdminUser } from '@cloudbeaver/core-authentication';
-import { injectable } from '@cloudbeaver/core-di';
-import { Executor } from '@cloudbeaver/core-executor';
-import type { AdminUserInfo } from '@cloudbeaver/core-sdk';
-import { TabsContainer } from '@cloudbeaver/core-ui';
-import type { MetadataMap } from '@cloudbeaver/core-utils';
-
-import type { UserFormController } from './UserFormController';
-
-export interface IUserFormProps {
-  user: AdminUserInfo;
-  controller: UserFormController;
-  editing?: boolean;
-}
-
-export interface IUserFormState {
-  user: AdminUser;
-  partsState: MetadataMap<string, any>;
-  props: IUserFormProps;
-}
-
-@injectable()
-export class UserFormService {
-  readonly onFormInit: Executor;
-  readonly tabsContainer: TabsContainer<IUserFormProps>;
-
-  constructor() {
-    this.tabsContainer = new TabsContainer('User settings');
-    this.onFormInit = new Executor();
-  }
-}
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserInfo.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserInfo.tsx
deleted file mode 100644
index 9b6e868786..0000000000
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserInfo.tsx
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2023 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 { useCallback } from 'react';
-import styled, { css } from 'reshadow';
-
-import { AuthRolesResource, UserMetaParametersResource } from '@cloudbeaver/core-authentication';
-import {
-  ColoredContainer,
-  Combobox,
-  Container,
-  FieldCheckbox,
-  Group,
-  GroupTitle,
-  InputField,
-  Loader,
-  ObjectPropertyInfoForm,
-  useResource,
-  useStyles,
-  useTranslate,
-} from '@cloudbeaver/core-blocks';
-import type { TabContainerPanelComponent } from '@cloudbeaver/core-ui';
-
-import type { IUserFormProps } from './UserFormService';
-
-const styles = css`
-  Group {
-    height: 100%;
-
-    & > Group {
-      height: initial;
-    }
-  }
-`;
-
-const PASSWORD_PLACEHOLDER = '••••••';
-
-export const UserInfo: TabContainerPanelComponent<IUserFormProps> = observer(function UserInfo({ controller, editing }) {
-  const style = useStyles(styles);
-  const translate = useTranslate();
-  const userMetaParameters = useResource(UserInfo, UserMetaParametersResource, undefined);
-  const authRoles = useResource(UserInfo, AuthRolesResource, undefined);
-
-  const handleTeamChange = useCallback((teamId: string, value: boolean) => {
-    controller.credentials.teams.set(teamId, value);
-  }, []);
-
-  return styled(style)(
-    <ColoredContainer gap overflow>
-      <Group small gap vertical overflow>
-        <Container gap vertical>
-          <GroupTitle keepSize>{translate('authentication_user_credentials')}</GroupTitle>
-          <InputField
-            type="text"
-            name="login"
-            state={controller.credentials}
-            disabled={controller.isSaving}
-            readOnly={editing}
-            mod="surface"
-            keepSize
-            tiny
-            required
-          >
-            {translate('authentication_user_name')}
-          </InputField>
-          {controller.local && (
-            <>
-              <InputField
-                type="password"
-                name="password"
-                state={controller.credentials}
-                autoComplete="new-password"
-                placeholder={editing ? PASSWORD_PLACEHOLDER : ''}
-                disabled={controller.isSaving}
-                canShowPassword={controller.credentials['password'] !== ''}
-                mod="surface"
-                keepSize
-                tiny
-                required
-              >
-                {translate('authentication_user_password')}
-              </InputField>
-              <InputField
-                type="password"
-                name="passwordRepeat"
-                state={controller.credentials}
-                placeholder={editing ? PASSWORD_PLACEHOLDER : ''}
-                canShowPassword={controller.credentials['passwordRepeat'] !== ''}
-                disabled={controller.isSaving}
-                mod="surface"
-                keepSize
-                tiny
-                required
-              >
-                {translate('authentication_user_password_repeat')}
-              </InputField>
-            </>
-          )}
-        </Container>
-      </Group>
-      <Group small gap overflow>
-        {authRoles.data.length > 0 && (
-          <Combobox
-            name="authRole"
-            state={controller.credentials}
-            items={authRoles.data}
-            keySelector={value => value}
-            valueSelector={value => value}
-            disabled={controller.isSaving}
-          >
-            {translate('authentication_user_role')}
-          </Combobox>
-        )}
-        <GroupTitle>{translate('authentication_user_status')}</GroupTitle>
-        <FieldCheckbox id={`${controller.user.userId}_user_enabled`} name="enabled" state={controller} disabled={controller.isSaving}>
-          {translate('authentication_user_enabled')}
-        </FieldCheckbox>
-        <GroupTitle>{translate('authentication_user_team')}</GroupTitle>
-        <Group boxNoOverflow gap dense>
-          {controller.teams.map(team => {
-            const label = `${team.teamId}${team.teamName && team.teamName !== team.teamId ? ' (' + team.teamName + ')' : ''}`;
-            const tooltip = `${label}${team.description ? '\n' + team.description : ''}`;
-            return (
-              <FieldCheckbox
-                key={team.teamId}
-                id={`${controller.user.userId}_${team.teamId}`}
-                title={tooltip}
-                name="team"
-                checked={!!controller.credentials.teams.get(team.teamId)}
-                disabled={controller.isSaving}
-                onChange={checked => handleTeamChange(team.teamId, checked)}
-              >
-                {label}
-              </FieldCheckbox>
-            );
-          })}
-        </Group>
-      </Group>
-      <Loader state={userMetaParameters} inline>
-        {() =>
-          userMetaParameters.data.length > 0 &&
-          styled(style)(
-            <Group small gap vertical overflow>
-              <GroupTitle keepSize>{translate('authentication_user_meta_parameters')}</GroupTitle>
-              <ObjectPropertyInfoForm
-                state={controller.credentials.metaParameters}
-                properties={userMetaParameters.data}
-                disabled={controller.isSaving}
-                keepSize
-                tiny
-              />
-            </Group>,
-          )
-        }
-      </Loader>
-    </ColoredContainer>,
-  );
-});
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministration.m.css b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministration.m.css
new file mode 100644
index 0000000000..822d95bd7e
--- /dev/null
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministration.m.css
@@ -0,0 +1,29 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+
+.tabList {
+  position: relative;
+  flex-shrink: 0;
+  align-items: center;
+  padding: 0 24px;
+
+  .tab {
+    height: 100%;
+    font-size: 14px;
+    font-weight: 700;
+    padding: 0 4px;
+
+    .tabTitle {
+      font-weight: 700;
+    }
+  }
+}
+
+.tabPanel {
+  overflow: auto;
+}
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministration.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministration.tsx
index 62aca80e40..799e2d1717 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministration.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministration.tsx
@@ -9,35 +9,16 @@ import { observer } from 'mobx-react-lite';
 import styled, { css } from 'reshadow';
 
 import { ADMINISTRATION_TOOLS_PANEL_STYLES, AdministrationItemContentComponent } from '@cloudbeaver/core-administration';
-import { ToolsPanel, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
+import { s, ToolsPanel, useS, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { BASE_TAB_STYLES, ITabData, Tab, TabList, TabPanel, TabsState, TabTitle, UNDERLINE_TAB_STYLES } from '@cloudbeaver/core-ui';
 
-import { MetaParameters } from './MetaParameters/MetaParameters';
 import { TeamsPage } from './Teams/TeamsPage';
+import style from './UsersAdministration.m.css';
 import { EUsersAdministrationSub, UsersAdministrationNavigationService } from './UsersAdministrationNavigationService';
 import { UsersPage } from './UsersTable/UsersPage';
 
 const tabsStyles = css`
-  TabList {
-    position: relative;
-    flex-shrink: 0;
-    align-items: center;
-    padding: 0 24px;
-  }
-
-  TabPanel {
-    flex-direction: column;
-    overflow: auto;
-  }
-
-  Tab {
-    height: 100%;
-    font-size: 14px;
-    font-weight: 700;
-    padding: 0 4px;
-  }
-
   tab-inner {
     height: 100%;
   }
@@ -45,19 +26,15 @@ const tabsStyles = css`
   tab-outer {
     height: 100%;
   }
-
-  TabTitle {
-    font-weight: 700;
-  }
 `;
 
+const tabStyle = [ADMINISTRATION_TOOLS_PANEL_STYLES, BASE_TAB_STYLES, tabsStyles, UNDERLINE_TAB_STYLES];
+
 export const UsersAdministration: AdministrationItemContentComponent = observer(function UsersAdministration({ sub, param }) {
   const translate = useTranslate();
   const usersAdministrationNavigationService = useService(UsersAdministrationNavigationService);
   const subName = sub?.name || EUsersAdministrationSub.Users;
-
-  const tabStyle = [BASE_TAB_STYLES, tabsStyles, UNDERLINE_TAB_STYLES];
-  const style = useStyles(ADMINISTRATION_TOOLS_PANEL_STYLES, tabStyle);
+  const styles = useS(style);
 
   function openSub({ tabId }: ITabData) {
     if (subName === tabId) {
@@ -69,33 +46,24 @@ export const UsersAdministration: AdministrationItemContentComponent = observer(
     usersAdministrationNavigationService.navToSub(tabId as EUsersAdministrationSub, param || undefined);
   }
 
-  return styled(style)(
+  return styled(useStyles(tabStyle))(
     <TabsState selectedId={subName} lazy onChange={openSub}>
-      <ToolsPanel>
-        <TabList aria-label="User Administration pages" style={style}>
-          <Tab tabId={EUsersAdministrationSub.Users} style={style}>
-            <TabTitle>{translate('authentication_administration_item_users')}</TabTitle>
+      <ToolsPanel className={s(styles, { tabPanel: true })}>
+        <TabList className={s(styles, { tabList: true })} aria-label="User Administration pages" style={tabStyle}>
+          <Tab className={s(styles, { tab: true })} tabId={EUsersAdministrationSub.Users} style={tabStyle}>
+            <TabTitle className={s(styles, { tabTitle: true })}>{translate('authentication_administration_item_users')}</TabTitle>
           </Tab>
-          <Tab tabId={EUsersAdministrationSub.Teams} style={style}>
-            <TabTitle>{translate('administration_teams_tab_title')}</TabTitle>
+          <Tab className={s(styles, { tab: true })} tabId={EUsersAdministrationSub.Teams} style={tabStyle}>
+            <TabTitle className={s(styles, { tabTitle: true })}>{translate('administration_teams_tab_title')}</TabTitle>
           </Tab>
-          {/* <Tab
-            tabId={EUsersAdministrationSub.MetaProperties}
-            style={style}
-          >
-            {translate('authentication_administration_item_metaParameters')}
-          </Tab> */}
         </TabList>
       </ToolsPanel>
-      <TabPanel tabId={EUsersAdministrationSub.Users}>
+      <TabPanel className={s(styles, { tabPanel: true })} tabId={EUsersAdministrationSub.Users}>
         <UsersPage sub={sub} param={param} />
       </TabPanel>
-      <TabPanel tabId={EUsersAdministrationSub.Teams}>
+      <TabPanel className={s(styles, { tabPanel: true })} tabId={EUsersAdministrationSub.Teams}>
         <TeamsPage sub={sub} param={param} />
       </TabPanel>
-      <TabPanel tabId={EUsersAdministrationSub.MetaProperties}>
-        <MetaParameters />
-      </TabPanel>
     </TabsState>,
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministrationNavigationService.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministrationNavigationService.ts
index 08ad73ce6c..5790248cb0 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministrationNavigationService.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministrationNavigationService.ts
@@ -8,6 +8,8 @@
 import { AdministrationScreenService } from '@cloudbeaver/core-administration';
 import { injectable } from '@cloudbeaver/core-di';
 
+import { ADMINISTRATION_ITEM_USER_CREATE_PARAM } from './ADMINISTRATION_ITEM_USER_CREATE_PARAM';
+
 export enum EUsersAdministrationSub {
   Users = 'users',
   Teams = 'teams',
@@ -27,7 +29,7 @@ export class UsersAdministrationNavigationService {
   }
 
   navToCreate(): void {
-    this.navToSub(EUsersAdministrationSub.Users, 'create');
+    this.navToSub(EUsersAdministrationSub.Users, ADMINISTRATION_ITEM_USER_CREATE_PARAM);
   }
 
   navToSub(sub: EUsersAdministrationSub, param?: string): void {
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministrationService.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministrationService.ts
index 1110105765..16eabe712a 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministrationService.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministrationService.ts
@@ -16,9 +16,9 @@ import { CreateTeamService } from './Teams/CreateTeamService';
 import { EUsersAdministrationSub, UsersAdministrationNavigationService } from './UsersAdministrationNavigationService';
 import { CreateUserService } from './UsersTable/CreateUserService';
 
-const Origin = React.lazy(async () => {
-  const { Origin } = await import('./UsersTable/UserDetailsInfo/Origin');
-  return { default: Origin };
+const UserCredentialsList = React.lazy(async () => {
+  const { UserCredentialsList } = await import('./UsersTable/UserCredentialsList');
+  return { default: UserCredentialsList };
 });
 
 const UsersDrawerItem = React.lazy(async () => {
@@ -75,7 +75,7 @@ export class UsersAdministrationService extends Bootstrap {
       getContentComponent: () => UsersAdministration,
       getDrawerComponent: () => UsersDrawerItem,
     });
-    this.userDetailsInfoPlaceholder.add(Origin, 0);
+    this.userDetailsInfoPlaceholder.add(UserCredentialsList, 0);
   }
 
   load(): void | Promise<void> {}
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUser.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUser.tsx
index ec8759ff15..2742ef13f0 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUser.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUser.tsx
@@ -7,16 +7,13 @@
  */
 import styled, { css } from 'reshadow';
 
-import { Translate } from '@cloudbeaver/core-blocks';
-import type { AdminUserInfo } from '@cloudbeaver/core-sdk';
+import { Loader, Translate } from '@cloudbeaver/core-blocks';
+import type { IFormState } from '@cloudbeaver/core-ui';
 
-import { UserForm } from '../UserForm/UserForm';
+import { AdministrationUserForm } from '../UserForm/AdministrationUserForm';
+import type { IUserFormState, UserFormProps } from '../UserForm/AdministrationUserFormService';
 
 const styles = css`
-  user-create-footer,
-  user-create-content {
-    composes: theme-background-secondary theme-text-on-secondary from global;
-  }
   user-create {
     display: flex;
     flex-direction: column;
@@ -35,6 +32,7 @@ const styles = css`
   }
 
   user-create-content {
+    composes: theme-background-secondary theme-text-on-secondary from global;
     position: relative;
     display: flex;
     flex-direction: column;
@@ -44,18 +42,20 @@ const styles = css`
 `;
 
 interface Props {
-  user: AdminUserInfo;
+  state: IFormState<IUserFormState>;
   onCancel: () => void;
 }
 
-export const CreateUser: React.FC<Props> = function CreateUser({ user, onCancel }) {
+export const CreateUser: React.FC<Props> = function CreateUser({ state, onCancel }) {
   return styled(styles)(
     <user-create>
       <title-bar>
         <Translate token="authentication_administration_user_connections_user_add" />
       </title-bar>
       <user-create-content>
-        <UserForm user={user} onCancel={onCancel} />
+        <Loader suspense>
+          <AdministrationUserForm state={state} onClose={onCancel} />
+        </Loader>
       </user-create-content>
     </user-create>,
   );
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUserBootstrap.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUserBootstrap.ts
new file mode 100644
index 0000000000..f52a44d50c
--- /dev/null
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUserBootstrap.ts
@@ -0,0 +1,78 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { DATA_CONTEXT_ADMINISTRATION_ITEM_ROUTE } from '@cloudbeaver/core-administration';
+import { AUTH_PROVIDER_LOCAL_ID, AuthProvidersResource } from '@cloudbeaver/core-authentication';
+import { Bootstrap, injectable } from '@cloudbeaver/core-di';
+import { CachedMapAllKey, getCachedMapResourceLoaderState } from '@cloudbeaver/core-sdk';
+import { ACTION_CREATE, ActionService, MenuService } from '@cloudbeaver/core-view';
+
+import { MENU_USERS_ADMINISTRATION } from '../../../Menus/MENU_USERS_ADMINISTRATION';
+import { ADMINISTRATION_ITEM_USER_CREATE_PARAM } from '../ADMINISTRATION_ITEM_USER_CREATE_PARAM';
+import { CreateUserService } from './CreateUserService';
+
+@injectable()
+export class CreateUserBootstrap extends Bootstrap {
+  constructor(
+    private readonly authProvidersResource: AuthProvidersResource,
+    private readonly createUserService: CreateUserService,
+    private readonly menuService: MenuService,
+    private readonly actionService: ActionService,
+  ) {
+    super();
+  }
+
+  register() {
+    this.menuService.addCreator({
+      menus: [MENU_USERS_ADMINISTRATION],
+      getItems(context, items) {
+        return [...items, ACTION_CREATE];
+      },
+    });
+
+    this.actionService.addHandler({
+      id: 'users-table-base',
+      isActionApplicable: (context, action) => {
+        if (action === ACTION_CREATE) {
+          return this.authProvidersResource.has(AUTH_PROVIDER_LOCAL_ID);
+        }
+
+        return false;
+      },
+      isDisabled: (context, action) => {
+        if (action === ACTION_CREATE) {
+          const administrationItemRoute = context.tryGet(DATA_CONTEXT_ADMINISTRATION_ITEM_ROUTE);
+
+          return administrationItemRoute?.param === ADMINISTRATION_ITEM_USER_CREATE_PARAM && !!this.createUserService.state;
+        }
+
+        return false;
+      },
+      getLoader: (context, action) => {
+        return getCachedMapResourceLoaderState(this.authProvidersResource, () => CachedMapAllKey);
+      },
+      handler: (context, action) => {
+        switch (action) {
+          case ACTION_CREATE:
+            this.createUserService.create();
+            break;
+        }
+      },
+      getActionInfo: (context, action) => {
+        if (action === ACTION_CREATE) {
+          return {
+            ...action.info,
+            icon: 'add',
+            tooltip: 'authentication_administration_tools_add_tooltip',
+          };
+        }
+
+        return action.info;
+      },
+    });
+  }
+}
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUserService.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUserService.ts
index 881817aa8c..204ccfe0ed 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUserService.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUserService.ts
@@ -7,11 +7,11 @@
  */
 import { makeObservable, observable } from 'mobx';
 
-import { UsersResource } from '@cloudbeaver/core-authentication';
 import { PlaceholderContainer } from '@cloudbeaver/core-blocks';
-import { injectable } from '@cloudbeaver/core-di';
-import type { AdminUserInfo } from '@cloudbeaver/core-sdk';
+import { App, injectable } from '@cloudbeaver/core-di';
 
+import { AdministrationUserFormService } from '../UserForm/AdministrationUserFormService';
+import { AdministrationUserFormState } from '../UserForm/AdministrationUserFormState';
 import { UsersAdministrationNavigationService } from '../UsersAdministrationNavigationService';
 
 export interface IToolsContainerProps {
@@ -20,18 +20,19 @@ export interface IToolsContainerProps {
 
 @injectable()
 export class CreateUserService {
-  user: AdminUserInfo | null;
+  state: AdministrationUserFormState | null;
   readonly toolsContainer: PlaceholderContainer<IToolsContainerProps>;
 
   constructor(
+    private readonly app: App,
+    private readonly administrationUserFormService: AdministrationUserFormService,
     private readonly usersAdministrationNavigationService: UsersAdministrationNavigationService,
-    private readonly usersResource: UsersResource,
   ) {
     this.toolsContainer = new PlaceholderContainer();
-    this.user = null;
+    this.state = null;
 
     makeObservable(this, {
-      user: observable,
+      state: observable,
     });
 
     this.clearUserTemplate = this.clearUserTemplate.bind(this);
@@ -45,16 +46,16 @@ export class CreateUserService {
   }
 
   create(): void {
-    if (this.user) {
+    if (this.state) {
       return;
     }
 
-    this.user = this.usersResource.getEmptyUser();
+    this.state = new AdministrationUserFormState(this.app, this.administrationUserFormService, { userId: null });
     this.usersAdministrationNavigationService.navToCreate();
   }
 
   clearUserTemplate(): void {
-    this.user = null;
+    this.state = null;
   }
 
   close(): void {
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserCredentialsList.m.css b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserCredentialsList.m.css
new file mode 100644
index 0000000000..35e1d3024f
--- /dev/null
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserCredentialsList.m.css
@@ -0,0 +1,36 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+
+.container {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 24px;
+  height: 46px;
+  cursor: pointer;
+}
+
+.container:hover {
+  & .icon {
+    display: block;
+  }
+
+  & .originIcon {
+    display: none;
+  }
+}
+
+.icon {
+  display: none;
+  width: 16px;
+}
+
+.staticImage {
+  width: 24px;
+  height: 24px;
+}
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserDetailsInfo/Origin.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserCredentialsList.tsx
similarity index 77%
rename from webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserDetailsInfo/Origin.tsx
rename to webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserCredentialsList.tsx
index 5713c8127d..f8d6a21314 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserDetailsInfo/Origin.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserCredentialsList.tsx
@@ -6,7 +6,7 @@
  * you may not use this file except in compliance with the License.
  */
 import { observer } from 'mobx-react-lite';
-import styled, { css } from 'reshadow';
+import { Fragment } from 'react';
 
 import { AUTH_PROVIDER_LOCAL_ID, UsersResource } from '@cloudbeaver/core-authentication';
 import { Icon, PlaceholderComponent, s, StaticImage, useS, useTranslate } from '@cloudbeaver/core-blocks';
@@ -15,32 +15,26 @@ import { CommonDialogService, ConfirmationDialog, DialogueStateResult } from '@c
 import { NotificationService } from '@cloudbeaver/core-events';
 import type { ObjectOrigin } from '@cloudbeaver/core-sdk';
 
-import type { IUserDetailsInfoProps } from '../../UsersAdministrationService';
-import style from './Origin.m.css';
+import type { IUserDetailsInfoProps } from '../UsersAdministrationService';
+import style from './UserCredentialsList.m.css';
 
-const USER_DETAILS_STYLES = css`
-  StaticImage {
-    width: 24px;
-    height: 24px;
-  }
-`;
-
-interface IOriginIconProps {
+interface IUserCredentialsProps {
   origin: ObjectOrigin;
   className?: string;
 }
 
-export const OriginIcon = observer<IOriginIconProps>(function Origin({ origin, className }) {
+export const UserCredentials = observer<IUserCredentialsProps>(function UserCredentials({ origin, className }) {
   const translate = useTranslate();
+  const styles = useS(style);
 
   const isLocal = origin.type === AUTH_PROVIDER_LOCAL_ID;
   const icon = isLocal ? '/icons/local_connection.svg' : origin.icon;
   const title = isLocal ? translate('authentication_administration_user_local') : origin.displayName;
 
-  return styled(USER_DETAILS_STYLES)(<StaticImage key={origin.type + origin.subType} icon={icon} title={title} className={className} />);
+  return <StaticImage icon={icon} title={title} className={s(styles, { staticImage: true }, className)} />;
 });
 
-export const Origin: PlaceholderComponent<IUserDetailsInfoProps> = observer(function Origin({ user }) {
+export const UserCredentialsList: PlaceholderComponent<IUserDetailsInfoProps> = observer(function UserCredentialsList({ user }) {
   const translate = useTranslate();
   const usersResource = useService(UsersResource);
   const commonDialogService = useService(CommonDialogService);
@@ -69,7 +63,7 @@ export const Origin: PlaceholderComponent<IUserDetailsInfoProps> = observer(func
   }
 
   return (
-    <>
+    <Fragment key="user-credentials-list">
       {user.origins.map(origin => (
         <div
           key={origin.type + origin.subType}
@@ -77,10 +71,10 @@ export const Origin: PlaceholderComponent<IUserDetailsInfoProps> = observer(func
           className={s(styles, { container: true })}
           onClick={() => onDelete(origin.type, origin.displayName)}
         >
-          <OriginIcon className={s(styles, { originIcon: true })} origin={origin} />
+          <UserCredentials className={s(styles, { originIcon: true })} origin={origin} />
           <Icon className={s(styles, { icon: true })} name="reject" viewBox="0 0 16 16" />
         </div>
       ))}
-    </>
+    </Fragment>
   );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserDetailsInfo/Origin.m.css b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserDetailsInfo/Origin.m.css
deleted file mode 100644
index b2b817ca63..0000000000
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserDetailsInfo/Origin.m.css
+++ /dev/null
@@ -1,22 +0,0 @@
-.container {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 24px;
-  height: 46px;
-  cursor: pointer;
-}
-.container:hover {
-  & .icon {
-    display: block;
-  }
-
-  & .originIcon {
-    display: none;
-  }
-}
-
-.icon {
-  display: none;
-  width: 16px;
-}
\ No newline at end of file
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserEdit.m.css b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserEdit.m.css
new file mode 100644
index 0000000000..356875116b
--- /dev/null
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserEdit.m.css
@@ -0,0 +1,16 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+
+.box {
+  composes: theme-background-secondary theme-text-on-secondary from global;
+  box-sizing: border-box;
+  padding-bottom: 24px;
+  height: 600px;
+  display: flex;
+  flex-direction: column;
+}
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserEdit.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserEdit.tsx
index 542e34831a..26bc18db16 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserEdit.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserEdit.tsx
@@ -6,34 +6,34 @@
  * you may not use this file except in compliance with the License.
  */
 import { observer } from 'mobx-react-lite';
-import { useCallback, useContext } from 'react';
-import styled, { css } from 'reshadow';
+import { useState } from 'react';
 
-import { UsersResource } from '@cloudbeaver/core-authentication';
-import { Loader, TableContext, useResource } from '@cloudbeaver/core-blocks';
-import type { AdminUserInfo } from '@cloudbeaver/core-sdk';
+import { Loader, s, TableItemExpandProps, useS } from '@cloudbeaver/core-blocks';
+import { App, useService } from '@cloudbeaver/core-di';
+import { FormMode } from '@cloudbeaver/core-ui';
 
-import { UserForm } from '../UserForm/UserForm';
+import { AdministrationUserForm } from '../UserForm/AdministrationUserForm';
+import { AdministrationUserFormService } from '../UserForm/AdministrationUserFormService';
+import { AdministrationUserFormState } from '../UserForm/AdministrationUserFormState';
+import style from './UserEdit.m.css';
 
-const styles = css`
-  box {
-    composes: theme-background-secondary theme-text-on-secondary from global;
-    box-sizing: border-box;
-    padding-bottom: 24px;
-    height: 560px;
-    display: flex;
-    flex-direction: column;
-  }
-`;
+export const UserEdit = observer<TableItemExpandProps<string>>(function UserEdit({ item, onClose }) {
+  const styles = useS(style);
+  const administrationUserFormService = useService(AdministrationUserFormService);
+  const app = useService(App);
+  const [state] = useState(() => {
+    const state = new AdministrationUserFormState(app, administrationUserFormService, {
+      userId: item,
+    });
+    state.setMode(FormMode.Edit);
+    return state;
+  });
 
-interface Props {
-  item: string;
-}
-
-export const UserEdit = observer<Props>(function UserEdit({ item }) {
-  const user = useResource(UserEdit, UsersResource, { key: item, includes: ['includeMetaParameters'] });
-  const tableContext = useContext(TableContext);
-  const collapse = useCallback(() => tableContext?.setItemExpand(item, false), [tableContext]);
-
-  return styled(styles)(<box>{user.data ? <UserForm user={user.data as AdminUserInfo} editing onCancel={collapse} /> : <Loader />}</box>);
+  return (
+    <div className={s(styles, { box: true })}>
+      <Loader suspense>
+        <AdministrationUserForm state={state} onClose={onClose} />
+      </Loader>
+    </div>
+  );
 });
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UsersAdministrationToolsPanel.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UsersAdministrationToolsPanel.tsx
index 84b23666fd..e778893bf2 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UsersAdministrationToolsPanel.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UsersAdministrationToolsPanel.tsx
@@ -7,20 +7,15 @@
  */
 import { observer } from 'mobx-react-lite';
 
-import { AUTH_PROVIDER_LOCAL_ID, AuthProvidersResource } from '@cloudbeaver/core-authentication';
 import { s, SContext, StyleRegistry, ToolsAction, ToolsPanel, useResource, useTranslate } from '@cloudbeaver/core-blocks';
-import { useService } from '@cloudbeaver/core-di';
-import { CachedMapAllKey } from '@cloudbeaver/core-sdk';
 import { MenuBar, MenuBarItemStyles } from '@cloudbeaver/core-ui';
 import { useMenu } from '@cloudbeaver/core-view';
 
 import { MENU_USERS_ADMINISTRATION } from '../../../Menus/MENU_USERS_ADMINISTRATION';
-import { CreateUserService } from './CreateUserService';
-import styles from './UsersAdministrationToolsPanel.m.css';
 import UsersAdministrationMenuBarItemStyles from './UsersAdministrationMenuBarItemStyles.m.css';
+import styles from './UsersAdministrationToolsPanel.m.css';
 
 interface Props {
-  create: boolean;
   onUpdate: () => void;
 }
 
@@ -34,26 +29,12 @@ const registry: StyleRegistry = [
   ],
 ];
 
-export const UsersAdministrationToolsPanel = observer<Props>(function UsersAdministrationToolsPanel({ create, onUpdate }) {
-  const createUserService = useService(CreateUserService);
-  const authProvidersResource = useResource(UsersAdministrationToolsPanel, AuthProvidersResource, CachedMapAllKey);
+export const UsersAdministrationToolsPanel = observer<Props>(function UsersAdministrationToolsPanel({ onUpdate }) {
   const translate = useTranslate();
-  const isLocalProviderAvailable = authProvidersResource.resource.has(AUTH_PROVIDER_LOCAL_ID);
   const menu = useMenu({ menu: MENU_USERS_ADMINISTRATION });
 
   return (
     <ToolsPanel className={s(styles, { toolsPanel: true })}>
-      {isLocalProviderAvailable && (
-        <ToolsAction
-          title={translate('authentication_administration_tools_add_tooltip')}
-          icon="add"
-          viewBox="0 0 24 24"
-          disabled={create && !!createUserService.user}
-          onClick={createUserService.create}
-        >
-          {translate('ui_create')}
-        </ToolsAction>
-      )}
       <SContext registry={registry}>
         <MenuBar menu={menu} className={s(styles, { menuBar: true })} />
       </SContext>
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UsersPage.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UsersPage.tsx
index edc295f1dd..1ce6337740 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UsersPage.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UsersPage.tsx
@@ -41,13 +41,13 @@ export const UsersPage = observer<Props>(function UsersPage({ sub, param }) {
   return styled(style)(
     <ColoredContainer vertical wrap gap parent>
       <Group box keepSize>
-        <UsersAdministrationToolsPanel create={create} onUpdate={table.update} />
+        <UsersAdministrationToolsPanel onUpdate={table.update} />
       </Group>
 
       <Container overflow gap>
-        {create && createUserService.user && (
+        {create && createUserService.state && (
           <Group box>
-            <CreateUser user={createUserService.user} onCancel={createUserService.cancelCreate} />
+            <CreateUser state={createUserService.state} onCancel={createUserService.cancelCreate} />
           </Group>
         )}
 
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UsersTable.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UsersTable.tsx
index 4509e0a164..1ff20acc9e 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UsersTable.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UsersTable.tsx
@@ -48,11 +48,6 @@ export const UsersTable = observer<Props>(function UsersTable({
   return (
     <Table keys={keys} selectedItems={selectedItems} expandedItems={expandedItems} size="big">
       <TableHeader fixed>
-        {/* {isLocalProviderAvailable && (
-                  <TableColumnHeader min flex centerContent>
-                    <TableSelect />
-                  </TableColumnHeader>
-                )} */}
         <TableColumnHeader min>
           <Loader loading={loading} small />
         </TableColumnHeader>
@@ -60,19 +55,14 @@ export const UsersTable = observer<Props>(function UsersTable({
         {displayAuthRole && <TableColumnHeader>{translate('authentication_user_role')}</TableColumnHeader>}
         <TableColumnHeader>{translate('authentication_user_team')}</TableColumnHeader>
         <TableColumnHeader>{translate('authentication_user_enabled')}</TableColumnHeader>
-        <TableColumnHeader />
+        <TableColumnHeader>{translate('authentication_user_credentials')}</TableColumnHeader>
       </TableHeader>
       <TableBody>
         {users.map(user => (
-          <User
-            key={user.userId}
-            user={user}
-            displayAuthRole={displayAuthRole}
-            // selectable={isLocalProviderAvailable}
-          />
+          <User key={user.userId} user={user} displayAuthRole={displayAuthRole} />
         ))}
         {(loading || users.length === 0) && (
-          <TableItem item="load-more">
+          <TableItem item="empty">
             <TableColumnValue colSpan={colSpan} centerContent flex>
               {translate(loading ? 'ui_processing_loading' : 'authentication_administration_users_empty')}
             </TableColumnValue>
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/useUsersTable.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/useUsersTable.tsx
index 7cdd471659..15c6ebfbf1 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/useUsersTable.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/useUsersTable.tsx
@@ -89,7 +89,7 @@ export function useUsersTable(filters: IUserFilters) {
           this.state.unselect();
 
           for (const id of deletionList) {
-            this.state.unexpand(id);
+            this.state.collapse(id);
           }
         } catch (exception: any) {
           notificationService.logException(exception, 'authentication_administration_user_delete_fail');
diff --git a/webapp/packages/plugin-authentication-administration/src/index.ts b/webapp/packages/plugin-authentication-administration/src/index.ts
index 7cb7413f82..84d37c2ac7 100644
--- a/webapp/packages/plugin-authentication-administration/src/index.ts
+++ b/webapp/packages/plugin-authentication-administration/src/index.ts
@@ -8,9 +8,12 @@ export * from './Administration/Users/UsersAdministrationNavigationService';
 export * from './Administration/Users/Teams/TeamFormService';
 export * from './Administration/Users/Teams/ITeamFormProps';
 export * from './Administration/Users/Teams/Contexts/teamContext';
-export * from './Administration/Users/UserForm/UserFormService';
 export * from './Administration/Users/UsersTable/CreateUserService';
 export * from './Administration/Users/UsersAdministrationService';
+export * from './Administration/Users/UserForm/AdministrationUserFormService';
+export * from './Administration/Users/UserForm/AdministrationUserFormState';
+export * from './Administration/Users/UserForm/Info/DATA_CONTEXT_USER_FORM_INFO_PART';
+export * from './Administration/Users/UserForm/Info/UserFormInfoPartService';
 export * from './Administration/IdentityProviders/IAuthConfigurationFormProps';
 export * from './Administration/IdentityProviders/AuthConfigurationFormService';
 export * from './Menus/MENU_USERS_ADMINISTRATION';
diff --git a/webapp/packages/plugin-authentication-administration/src/manifest.ts b/webapp/packages/plugin-authentication-administration/src/manifest.ts
index 1e4db34826..1bd7799b4c 100644
--- a/webapp/packages/plugin-authentication-administration/src/manifest.ts
+++ b/webapp/packages/plugin-authentication-administration/src/manifest.ts
@@ -13,7 +13,6 @@ import { AuthConfigurationsAdministrationService } from './Administration/Identi
 import { CreateAuthConfigurationService } from './Administration/IdentityProviders/CreateAuthConfigurationService';
 import { AuthConfigurationOptionsTabService } from './Administration/IdentityProviders/Options/AuthConfigurationOptionsTabService';
 import { ServerConfigurationAuthenticationBootstrap } from './Administration/ServerConfiguration/ServerConfigurationAuthenticationBootstrap';
-import { CreateMetaParameterService } from './Administration/Users/MetaParameters/CreateMetaParameterService';
 import { CreateTeamService } from './Administration/Users/Teams/CreateTeamService';
 import { GrantedConnectionsTabService } from './Administration/Users/Teams/GrantedConnections/GrantedConnectionsTabService';
 import { GrantedUsersTabService } from './Administration/Users/Teams/GrantedUsers/GrantedUsersTabService';
@@ -21,11 +20,15 @@ import { TeamOptionsTabService } from './Administration/Users/Teams/Options/Team
 import { TeamFormService } from './Administration/Users/Teams/TeamFormService';
 import { TeamsAdministrationNavService } from './Administration/Users/Teams/TeamsAdministrationNavService';
 import { TeamsAdministrationService } from './Administration/Users/Teams/TeamsAdministrationService';
-import { ConnectionAccessTabBootstrap } from './Administration/Users/UserForm/ConnectionAccess/ConnectionAccessTabBootstrap';
+import { AdministrationUserFormService } from './Administration/Users/UserForm/AdministrationUserFormService';
+import { UserFormConnectionAccessPartBootstrap } from './Administration/Users/UserForm/ConnectionAccess/UserFormConnectionAccessPartBootstrap';
+import { UserFormInfoPartBootstrap } from './Administration/Users/UserForm/Info/UserFormInfoPartBootstrap';
+import { UserFormInfoPartService } from './Administration/Users/UserForm/Info/UserFormInfoPartService';
+import { UserFormOriginPartBootstrap } from './Administration/Users/UserForm/Origin/UserFormOriginPartBootstrap';
 import { UserFormBaseBootstrap } from './Administration/Users/UserForm/UserFormBaseBootstrap';
-import { UserFormService } from './Administration/Users/UserForm/UserFormService';
 import { UsersAdministrationNavigationService } from './Administration/Users/UsersAdministrationNavigationService';
 import { UsersAdministrationService } from './Administration/Users/UsersAdministrationService';
+import { CreateUserBootstrap } from './Administration/Users/UsersTable/CreateUserBootstrap';
 import { CreateUserService } from './Administration/Users/UsersTable/CreateUserService';
 import { AuthenticationLocaleService } from './AuthenticationLocaleService';
 import { PluginBootstrap } from './PluginBootstrap';
@@ -42,9 +45,7 @@ export const manifest: PluginManifest = {
     CreateUserService,
     UsersAdministrationNavigationService,
     ServerConfigurationAuthenticationBootstrap,
-    UserFormService,
-    CreateMetaParameterService,
-    UserFormBaseBootstrap,
+    AdministrationUserFormService,
     AuthConfigurationsAdministrationService,
     CreateAuthConfigurationService,
     AuthConfigurationsAdministrationNavService,
@@ -57,6 +58,11 @@ export const manifest: PluginManifest = {
     TeamOptionsTabService,
     GrantedUsersTabService,
     GrantedConnectionsTabService,
-    ConnectionAccessTabBootstrap,
+    CreateUserBootstrap,
+    UserFormBaseBootstrap,
+    UserFormInfoPartBootstrap,
+    UserFormOriginPartBootstrap,
+    UserFormConnectionAccessPartBootstrap,
+    UserFormInfoPartService,
   ],
 };
diff --git a/webapp/packages/plugin-authentication/src/Dialog/AuthDialog.tsx b/webapp/packages/plugin-authentication/src/Dialog/AuthDialog.tsx
index 9955807cb6..4ec05ae783 100644
--- a/webapp/packages/plugin-authentication/src/Dialog/AuthDialog.tsx
+++ b/webapp/packages/plugin-authentication/src/Dialog/AuthDialog.tsx
@@ -9,18 +9,7 @@ import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
 import { AuthProvider, AuthProviderConfiguration, UserInfoResource } from '@cloudbeaver/core-authentication';
-import {
-  ErrorMessage,
-  getComputed,
-  Link,
-  s,
-  SubmittingForm,
-  TextPlaceholder,
-  useErrorDetails,
-  useS,
-  useStyles,
-  useTranslate,
-} from '@cloudbeaver/core-blocks';
+import { ErrorMessage, Form, getComputed, Link, s, TextPlaceholder, useErrorDetails, useS, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import {
   CommonDialogBody,
@@ -224,9 +213,9 @@ export const AuthDialog: DialogComponent<IAuthOptions, null> = observer(function
               onClose={rejectDialog}
             />
           ) : (
-            <SubmittingForm className={s(styles, { submittingForm: true })} onSubmit={() => login(linkUser)}>
+            <Form className={s(styles, { submittingForm: true })} onSubmit={() => login(linkUser)}>
               {renderForm(state.activeProvider, state.activeConfiguration)}
-            </SubmittingForm>
+            </Form>
           )}
         </CommonDialogBody>
         {!federate && (
diff --git a/webapp/packages/plugin-connection-custom/src/CustomConnectionPluginBootstrap.ts b/webapp/packages/plugin-connection-custom/src/CustomConnectionPluginBootstrap.ts
index d408572fe3..ec3f52ee93 100644
--- a/webapp/packages/plugin-connection-custom/src/CustomConnectionPluginBootstrap.ts
+++ b/webapp/packages/plugin-connection-custom/src/CustomConnectionPluginBootstrap.ts
@@ -10,7 +10,7 @@ import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService } from '@cloudbeaver/core-dialogs';
 import { ProjectInfoResource } from '@cloudbeaver/core-projects';
 import { CachedMapAllKey, getCachedMapResourceLoaderState } from '@cloudbeaver/core-sdk';
-import { ActionService, DATA_CONTEXT_LOADABLE_STATE, MenuService } from '@cloudbeaver/core-view';
+import { ActionService, MenuService } from '@cloudbeaver/core-view';
 import { MENU_CONNECTIONS } from '@cloudbeaver/plugin-connections';
 
 import { ACTION_CONNECTION_CUSTOM } from './Actions/ACTION_CONNECTION_CUSTOM';
@@ -51,9 +51,7 @@ export class CustomConnectionPluginBootstrap extends Bootstrap {
         return false;
       },
       getLoader: (context, action) => {
-        const state = context.get(DATA_CONTEXT_LOADABLE_STATE);
-
-        return state.getState(action.id, () => getCachedMapResourceLoaderState(this.projectInfoResource, CachedMapAllKey));
+        return getCachedMapResourceLoaderState(this.projectInfoResource, () => CachedMapAllKey);
       },
       handler: async (context, action) => {
         switch (action) {
diff --git a/webapp/packages/plugin-connection-search/src/Search/DatabaseList.tsx b/webapp/packages/plugin-connection-search/src/Search/DatabaseList.tsx
index 5d75cb2d58..60a6996d26 100644
--- a/webapp/packages/plugin-connection-search/src/Search/DatabaseList.tsx
+++ b/webapp/packages/plugin-connection-search/src/Search/DatabaseList.tsx
@@ -9,13 +9,13 @@ import { observer } from 'mobx-react-lite';
 import { useCallback, useState } from 'react';
 import styled, { css } from 'reshadow';
 
-import { ItemList, ItemListSearch, SubmittingForm, TextPlaceholder, useFocus, useTranslate } from '@cloudbeaver/core-blocks';
+import { Form, ItemList, ItemListSearch, TextPlaceholder, useFocus, useTranslate } from '@cloudbeaver/core-blocks';
 import type { AdminConnectionSearchInfo } from '@cloudbeaver/core-sdk';
 
 import { Database } from './Database';
 
 const styles = css`
-  SubmittingForm {
+  Form {
     composes: theme-background-surface theme-text-on-surface from global;
     flex: 1;
     display: flex;
@@ -50,7 +50,7 @@ export const DatabaseList = observer<Props>(function DatabaseList({ databases, h
   const placeholderMessage = isSearched ? 'connections_not_found' : 'connections_administration_search_database_tip';
 
   return styled(styles)(
-    <SubmittingForm ref={focusedRef} className={className} onSubmit={onSearch}>
+    <Form ref={focusedRef} className={className} onSubmit={onSearch}>
       <ItemListSearch
         value={hosts}
         placeholder={translate('connections_administration_search_database_tip')}
@@ -64,6 +64,6 @@ export const DatabaseList = observer<Props>(function DatabaseList({ databases, h
         ))}
       </ItemList>
       {!databases.length && <TextPlaceholder>{translate(placeholderMessage)}</TextPlaceholder>}
-    </SubmittingForm>,
+    </Form>,
   );
 });
diff --git a/webapp/packages/plugin-connection-search/src/SearchConnectionPluginBootstrap.ts b/webapp/packages/plugin-connection-search/src/SearchConnectionPluginBootstrap.ts
index bf176be5b5..475e1b2600 100644
--- a/webapp/packages/plugin-connection-search/src/SearchConnectionPluginBootstrap.ts
+++ b/webapp/packages/plugin-connection-search/src/SearchConnectionPluginBootstrap.ts
@@ -11,7 +11,7 @@ import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { ProjectInfoResource } from '@cloudbeaver/core-projects';
 import { PermissionsService } from '@cloudbeaver/core-root';
 import { CachedMapAllKey, getCachedMapResourceLoaderState } from '@cloudbeaver/core-sdk';
-import { ActionService, DATA_CONTEXT_LOADABLE_STATE, DATA_CONTEXT_MENU, MenuService } from '@cloudbeaver/core-view';
+import { ActionService, DATA_CONTEXT_MENU, MenuService } from '@cloudbeaver/core-view';
 import { MENU_CONNECTIONS } from '@cloudbeaver/plugin-connections';
 
 import { ACTION_CONNECTION_SEARCH } from './Actions/ACTION_CONNECTION_SEARCH';
@@ -53,9 +53,7 @@ export class SearchConnectionPluginBootstrap extends Bootstrap {
         return false;
       },
       getLoader: (context, action) => {
-        const state = context.get(DATA_CONTEXT_LOADABLE_STATE);
-
-        return state.getState(action.id, () => getCachedMapResourceLoaderState(this.projectInfoResource, CachedMapAllKey));
+        return getCachedMapResourceLoaderState(this.projectInfoResource, () => CachedMapAllKey);
       },
       handler: async (context, action) => {
         switch (action) {
diff --git a/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionDialog.tsx b/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionDialog.tsx
index 7bbd8cde1e..e05120ab47 100644
--- a/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionDialog.tsx
+++ b/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionDialog.tsx
@@ -7,7 +7,7 @@
  */
 import { observer } from 'mobx-react-lite';
 
-import { ErrorMessage, Loader, s, SubmittingForm, useAdministrationSettings, useFocus, useS, useTranslate } from '@cloudbeaver/core-blocks';
+import { ErrorMessage, Form, Loader, s, useAdministrationSettings, useFocus, useS, useTranslate } from '@cloudbeaver/core-blocks';
 import { useController } from '@cloudbeaver/core-di';
 import { CommonDialogBody, CommonDialogFooter, CommonDialogHeader, CommonDialogWrapper, DialogComponent } from '@cloudbeaver/core-dialogs';
 import { ConnectionAuthenticationFormLoader } from '@cloudbeaver/plugin-connections';
@@ -53,7 +53,7 @@ export const ConnectionDialog: DialogComponent<null, null> = observer(function C
               {controller.isConnecting && translate('basicConnection_connectionDialog_connecting_message')}
             </center>
           ) : (
-            <SubmittingForm ref={focusedRef} className={s(styles, { submittingForm: true })} onSubmit={controller.onConnect}>
+            <Form ref={focusedRef} className={s(styles, { submittingForm: true })} onSubmit={controller.onConnect}>
               <ConnectionAuthenticationFormLoader
                 config={controller.config}
                 authModelId={controller.authModel.id}
@@ -63,7 +63,7 @@ export const ConnectionDialog: DialogComponent<null, null> = observer(function C
                 disabled={controller.isConnecting}
                 className={s(styles, { connectionAuthenticationFormLoader: true })}
               />
-            </SubmittingForm>
+            </Form>
           ))}
       </CommonDialogBody>
       {controller.step === ConnectionStep.Connection && (
diff --git a/webapp/packages/plugin-connection-template/src/TemplateConnectionPluginBootstrap.ts b/webapp/packages/plugin-connection-template/src/TemplateConnectionPluginBootstrap.ts
index 27c12cf578..2bebf1e0c2 100644
--- a/webapp/packages/plugin-connection-template/src/TemplateConnectionPluginBootstrap.ts
+++ b/webapp/packages/plugin-connection-template/src/TemplateConnectionPluginBootstrap.ts
@@ -9,9 +9,8 @@ import { AppAuthService } from '@cloudbeaver/core-authentication';
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService } from '@cloudbeaver/core-dialogs';
 import { ProjectInfoResource, ProjectsService } from '@cloudbeaver/core-projects';
-import { PermissionsService } from '@cloudbeaver/core-root';
 import { CachedMapAllKey, getCachedDataResourceLoaderState, getCachedMapResourceLoaderState } from '@cloudbeaver/core-sdk';
-import { ActionService, DATA_CONTEXT_LOADABLE_STATE, DATA_CONTEXT_MENU, MenuService } from '@cloudbeaver/core-view';
+import { ActionService, DATA_CONTEXT_MENU, MenuService } from '@cloudbeaver/core-view';
 import { MENU_CONNECTIONS } from '@cloudbeaver/plugin-connections';
 
 import { ACTION_CONNECTION_TEMPLATE } from './Actions/ACTION_CONNECTION_TEMPLATE';
@@ -28,7 +27,6 @@ export class TemplateConnectionPluginBootstrap extends Bootstrap {
     private readonly projectInfoResource: ProjectInfoResource,
     private readonly templateConnectionsResource: TemplateConnectionsResource,
     private readonly commonDialogService: CommonDialogService,
-    private readonly permissionsService: PermissionsService,
     private readonly templateConnectionsService: TemplateConnectionsService,
     private readonly projectsService: ProjectsService,
   ) {
@@ -49,13 +47,11 @@ export class TemplateConnectionPluginBootstrap extends Bootstrap {
         !this.projectsService.userProject?.canEditDataSources ||
         !this.templateConnectionsService.projectTemplates.length,
       getLoader: (context, action) => {
-        const state = context.get(DATA_CONTEXT_LOADABLE_STATE);
-
-        return state.getState(action.id, () => [
+        return [
           ...this.appAuthService.loaders,
-          getCachedMapResourceLoaderState(this.projectInfoResource, CachedMapAllKey),
+          getCachedMapResourceLoaderState(this.projectInfoResource, () => CachedMapAllKey),
           getCachedDataResourceLoaderState(this.templateConnectionsResource, undefined, undefined),
-        ]);
+        ];
       },
       handler: async (context, action) => {
         switch (action) {
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 b5b6891281..bb1371c0a1 100644
--- a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessTabService.ts
+++ b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessTabService.ts
@@ -14,11 +14,11 @@ import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { executorHandlerFilter, IExecutionContextProvider } from '@cloudbeaver/core-executor';
 import { isGlobalProject, ProjectInfoResource } from '@cloudbeaver/core-projects';
 import { PermissionsService } from '@cloudbeaver/core-root';
+import { formStateContext } from '@cloudbeaver/core-ui';
 import type { MetadataValueGetter } from '@cloudbeaver/core-utils';
 import {
   connectionConfigContext,
   ConnectionFormService,
-  connectionFormStateContext,
   IConnectionFormProps,
   IConnectionFormState,
   IConnectionFormSubmitData,
@@ -124,7 +124,7 @@ export class ConnectionAccessTabService extends Bootstrap {
     const changed = await this.isChanged(key, state.grantedSubjects);
 
     if (changed) {
-      const stateContext = contexts.getContext(connectionFormStateContext);
+      const stateContext = contexts.getContext(formStateContext);
 
       stateContext.markEdited();
     }
diff --git a/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationDialog.tsx b/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationDialog.tsx
index 81d03035ea..8a0f6c8d62 100644
--- a/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationDialog.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationDialog.tsx
@@ -7,7 +7,7 @@
  */
 import { observer } from 'mobx-react-lite';
 
-import { Button, s, SubmittingForm, useFocus, useS, useTranslate } from '@cloudbeaver/core-blocks';
+import { Button, Form, s, useFocus, useS, useTranslate } from '@cloudbeaver/core-blocks';
 import { useDBDriver } from '@cloudbeaver/core-connections';
 import { CommonDialogBody, CommonDialogFooter, CommonDialogHeader, CommonDialogWrapper, DialogComponent } from '@cloudbeaver/core-dialogs';
 import type { ConnectionConfig } from '@cloudbeaver/core-sdk';
@@ -41,7 +41,7 @@ export const ConnectionAuthenticationDialog: DialogComponent<Payload> = observer
         onReject={rejectDialog}
       />
       <CommonDialogBody>
-        <SubmittingForm ref={focusedRef} className={s(styles, { submittingForm: true })} onSubmit={() => resolveDialog()}>
+        <Form ref={focusedRef} className={s(styles, { submittingForm: true })} onSubmit={() => resolveDialog()}>
           <ConnectionAuthenticationFormLoader
             config={payload.config}
             authModelId={payload.authModelId}
@@ -50,7 +50,7 @@ export const ConnectionAuthenticationDialog: DialogComponent<Payload> = observer
             className={s(styles, { connectionAuthenticationFormLoader: true })}
             hideFeatures={['nonSecuredProperty']}
           />
-        </SubmittingForm>
+        </Form>
       </CommonDialogBody>
       <CommonDialogFooter>
         <Button mod={['unelevated']} className={s(styles, { button: true })} onClick={() => resolveDialog()}>
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionForm.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionForm.tsx
index d6f13bf494..c38fb9263d 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionForm.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionForm.tsx
@@ -9,8 +9,19 @@ import { observer } from 'mobx-react-lite';
 import { useEffect } from 'react';
 import styled, { css } from 'reshadow';
 
-import { ExceptionMessage, IconOrImage, Loader, Placeholder, useExecutor, useObjectRef, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
+import {
+  ExceptionMessage,
+  IconOrImage,
+  Loader,
+  Placeholder,
+  StatusMessage,
+  useExecutor,
+  useObjectRef,
+  useStyles,
+  useTranslate,
+} from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
+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';
 
@@ -144,12 +155,7 @@ export const ConnectionForm = observer<Props>(function ConnectionForm({ state, o
         <connection-top-bar>
           <connection-top-bar-tabs>
             <connection-status-message>
-              {state.statusMessage && (
-                <>
-                  <IconOrImage icon="/icons/info_icon.svg" />
-                  {translate(state.statusMessage)}
-                </>
-              )}
+              <StatusMessage type={ENotificationType.Info} message={state.statusMessage} />
             </connection-status-message>
             <TabList style={style} disabled={state.disabled} />
           </connection-top-bar-tabs>
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormState.ts b/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormState.ts
index 51834fe407..2bfa321018 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormState.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormState.ts
@@ -7,16 +7,15 @@
  */
 import { action, computed, makeObservable, observable } from 'mobx';
 
-import type { IFormStateInfo } from '@cloudbeaver/core-blocks';
 import { ConnectionInfoResource, createConnectionParam, DatabaseConnection, IConnectionInfoParams } from '@cloudbeaver/core-connections';
 import { Executor, IExecutionContextProvider, IExecutor } from '@cloudbeaver/core-executor';
 import type { ProjectInfoResource, ProjectsService } from '@cloudbeaver/core-projects';
-import type { ConnectionConfig, ResourceKey, ResourceKeySimple } from '@cloudbeaver/core-sdk';
+import type { ConnectionConfig, ResourceKeySimple } from '@cloudbeaver/core-sdk';
+import { formStateContext, type IFormStateInfo } from '@cloudbeaver/core-ui';
 import { MetadataMap, uuid } from '@cloudbeaver/core-utils';
 
 import { connectionFormConfigureContext } from './connectionFormConfigureContext';
 import type { ConnectionFormService } from './ConnectionFormService';
-import { connectionFormStateContext } from './Contexts/connectionFormStateContext';
 import type { ConnectionFormMode, ConnectionFormType, IConnectionFormState, IConnectionFormSubmitData } from './IConnectionFormProps';
 
 export class ConnectionFormState implements IConnectionFormState {
@@ -28,7 +27,7 @@ export class ConnectionFormState implements IConnectionFormState {
 
   partsState: MetadataMap<string, any>;
 
-  statusMessage: string | null;
+  statusMessage: string | string[] | null;
   configured: boolean;
   initError: Error | null;
 
@@ -265,7 +264,7 @@ export class ConnectionFormState implements IConnectionFormState {
   }
 
   private updateFormState(data: IConnectionFormState, contexts: IExecutionContextProvider<IConnectionFormState>): void {
-    const context = contexts.getContext(connectionFormStateContext);
+    const context = contexts.getContext(formStateContext);
 
     if (this.mode === 'create') {
       context.markEdited();
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/Contexts/connectionFormStateContext.ts b/webapp/packages/plugin-connections/src/ConnectionForm/Contexts/connectionFormStateContext.ts
deleted file mode 100644
index 3c7fb83edd..0000000000
--- a/webapp/packages/plugin-connections/src/ConnectionForm/Contexts/connectionFormStateContext.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2023 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 { IFormStateInfo } from '@cloudbeaver/core-blocks';
-
-export interface IConnectionFormStateContext extends IFormStateInfo {
-  markEdited: () => void;
-  setStatusMessage: (message: string | null) => void;
-}
-
-export function connectionFormStateContext(): IConnectionFormStateContext {
-  return {
-    edited: false,
-    disabled: false,
-    readonly: false,
-    statusMessage: null,
-    markEdited() {
-      this.edited = true;
-    },
-    setStatusMessage(message: string | null) {
-      this.statusMessage = message;
-    },
-  };
-}
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/DriverProperties/ConnectionDriverPropertiesTabService.ts b/webapp/packages/plugin-connections/src/ConnectionForm/DriverProperties/ConnectionDriverPropertiesTabService.ts
index 07fcbcd570..c509c4ec09 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/DriverProperties/ConnectionDriverPropertiesTabService.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/DriverProperties/ConnectionDriverPropertiesTabService.ts
@@ -11,11 +11,11 @@ import { DBDriverResource } from '@cloudbeaver/core-connections';
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import type { IExecutionContextProvider } from '@cloudbeaver/core-executor';
 import { isObjectPropertyInfoStateEqual } from '@cloudbeaver/core-sdk';
+import { formStateContext } from '@cloudbeaver/core-ui';
 
 import { connectionFormConfigureContext } from '../connectionFormConfigureContext';
 import { ConnectionFormService } from '../ConnectionFormService';
 import { connectionConfigContext } from '../Contexts/connectionConfigContext';
-import { connectionFormStateContext } from '../Contexts/connectionFormStateContext';
 import type { IConnectionFormFillConfigData, IConnectionFormState, IConnectionFormSubmitData } from '../IConnectionFormProps';
 import { DriverPropertiesLoader } from './DriverPropertiesLoader';
 
@@ -95,7 +95,7 @@ export class ConnectionDriverPropertiesTabService extends Bootstrap {
     }
 
     if (!isObjectPropertyInfoStateEqual(driver.driverProperties, config.properties, data.info.properties)) {
-      const stateContext = contexts.getContext(connectionFormStateContext);
+      const stateContext = contexts.getContext(formStateContext);
 
       stateContext.markEdited();
     }
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/IConnectionFormProps.ts b/webapp/packages/plugin-connections/src/ConnectionForm/IConnectionFormProps.ts
index 1bd1681957..25e4a8b774 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/IConnectionFormProps.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/IConnectionFormProps.ts
@@ -5,10 +5,10 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-import type { IFormStateInfo } from '@cloudbeaver/core-blocks';
 import type { ConnectionInfoResource, DatabaseConnection } from '@cloudbeaver/core-connections';
 import type { IExecutor, IExecutorHandlersCollection } from '@cloudbeaver/core-executor';
 import type { ConnectionConfig } from '@cloudbeaver/core-sdk';
+import type { IFormStateInfo } from '@cloudbeaver/core-ui';
 import type { MetadataMap } from '@cloudbeaver/core-utils';
 
 export type ConnectionFormMode = 'edit' | 'create';
@@ -25,7 +25,7 @@ export interface IConnectionFormState {
 
   readonly id: string;
   readonly initError: Error | null;
-  readonly statusMessage: string | null;
+  readonly statusMessage: string | string[] | null;
   readonly disabled: boolean;
   readonly loading: boolean;
   readonly configured: boolean;
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/Options/ConnectionOptionsTabService.ts b/webapp/packages/plugin-connections/src/ConnectionForm/Options/ConnectionOptionsTabService.ts
index 560fea1808..a604d0cbf2 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/Options/ConnectionOptionsTabService.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/Options/ConnectionOptionsTabService.ts
@@ -23,13 +23,13 @@ import { LocalizationService } from '@cloudbeaver/core-localization';
 import { isSharedProject, ProjectInfoResource } from '@cloudbeaver/core-projects';
 import { ServerConfigResource } from '@cloudbeaver/core-root';
 import { DriverConfigurationType, isObjectPropertyInfoStateEqual, ObjectPropertyInfo } from '@cloudbeaver/core-sdk';
+import { formStateContext } from '@cloudbeaver/core-ui';
 import { getUniqueName, isNotNullDefined, isValuesEqual } from '@cloudbeaver/core-utils';
 
 import { connectionFormConfigureContext } from '../connectionFormConfigureContext';
 import { ConnectionFormService } from '../ConnectionFormService';
 import { connectionConfigContext } from '../Contexts/connectionConfigContext';
 import { connectionCredentialsStateContext } from '../Contexts/connectionCredentialsStateContext';
-import { connectionFormStateContext } from '../Contexts/connectionFormStateContext';
 import type { IConnectionFormFillConfigData, IConnectionFormState, IConnectionFormSubmitData } from '../IConnectionFormProps';
 import { getConnectionName } from './getConnectionName';
 
@@ -343,7 +343,7 @@ export class ConnectionOptionsTabService extends Bootstrap {
 
   private async formAuthState(data: IConnectionFormState, contexts: IExecutionContextProvider<IConnectionFormState>) {
     const config = contexts.getContext(connectionConfigContext);
-    const stateContext = contexts.getContext(connectionFormStateContext);
+    const stateContext = contexts.getContext(formStateContext);
 
     const driver = await this.dbDriverResource.load(config.driverId!, ['includeProviderProperties']);
     const authModel = await this.databaseAuthModelsResource.load(config.authModelId ?? data.info?.authModel ?? driver.defaultAuthModel);
@@ -357,7 +357,7 @@ export class ConnectionOptionsTabService extends Bootstrap {
       const message = this.localizationService.translate('connections_public_connection_cloud_auth_required', undefined, {
         providerLabel: provider.label,
       });
-      stateContext.setStatusMessage(message);
+      stateContext.setInfo(message);
       stateContext.readonly = data.mode === 'edit';
     }
   }
@@ -368,7 +368,7 @@ export class ConnectionOptionsTabService extends Bootstrap {
     }
 
     const config = contexts.getContext(connectionConfigContext);
-    const stateContext = contexts.getContext(connectionFormStateContext);
+    const stateContext = contexts.getContext(formStateContext);
     const driver = await this.dbDriverResource.load(data.config.driverId!, ['includeProviderProperties']);
 
     if (
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/Options/Options.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/Options/Options.tsx
index bee9ef0b57..3a41adb5ac 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/Options/Options.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/Options/Options.tsx
@@ -15,6 +15,7 @@ import {
   Combobox,
   Container,
   FieldCheckbox,
+  Form,
   FormFieldDescription,
   getComputed,
   Group,
@@ -23,7 +24,6 @@ import {
   ObjectPropertyInfoForm,
   Radio,
   RadioGroup,
-  SubmittingForm,
   Textarea,
   useAdministrationSettings,
   useFormValidator,
@@ -50,7 +50,7 @@ import { useOptions } from './useOptions';
 const PROFILE_AUTH_MODEL_ID = 'profile';
 
 const styles = css`
-  SubmittingForm {
+  Form {
     flex: 1;
     overflow: auto;
   }
@@ -168,7 +168,7 @@ export const Options: TabContainerPanelComponent<IConnectionFormProps> = observe
   }
 
   return styled(styles)(
-    <SubmittingForm ref={formRef} disabled={driverMap.isLoading()} onChange={handleFormChange}>
+    <Form ref={formRef} disabled={driverMap.isLoading()} onChange={handleFormChange}>
       <ColoredContainer wrap overflow parent gap>
         <Container medium gap>
           <Group form gap>
@@ -355,6 +355,6 @@ export const Options: TabContainerPanelComponent<IConnectionFormProps> = observe
           )}
         </Container>
       </ColoredContainer>
-    </SubmittingForm>,
+    </Form>,
   );
 });
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/ConnectionSSHTabService.ts b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/ConnectionSSHTabService.ts
index bb36e73e0c..055ea36ba5 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/ConnectionSSHTabService.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/ConnectionSSHTabService.ts
@@ -12,12 +12,12 @@ import { DBDriverResource, SSH_TUNNEL_ID } from '@cloudbeaver/core-connections';
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import type { IExecutionContextProvider } from '@cloudbeaver/core-executor';
 import { DriverConfigurationType, NetworkHandlerAuthType, NetworkHandlerConfigInput } from '@cloudbeaver/core-sdk';
+import { formStateContext } from '@cloudbeaver/core-ui';
 
 import { connectionFormConfigureContext } from '../connectionFormConfigureContext';
 import { ConnectionFormService } from '../ConnectionFormService';
 import { connectionConfigContext } from '../Contexts/connectionConfigContext';
 import { connectionCredentialsStateContext } from '../Contexts/connectionCredentialsStateContext';
-import { connectionFormStateContext } from '../Contexts/connectionFormStateContext';
 import type { IConnectionFormFillConfigData, IConnectionFormState, IConnectionFormSubmitData } from '../IConnectionFormProps';
 
 export const SSHTab = React.lazy(async () => {
@@ -199,7 +199,7 @@ export class ConnectionSSHTabService extends Bootstrap {
   private formState(data: IConnectionFormState, contexts: IExecutionContextProvider<IConnectionFormState>) {
     const config = contexts.getContext(connectionConfigContext);
     if (config.networkHandlersConfig !== undefined) {
-      const stateContext = contexts.getContext(connectionFormStateContext);
+      const stateContext = contexts.getContext(formStateContext);
 
       stateContext.markEdited();
     }
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
index f204bc90ea..a484f2cbff 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
@@ -17,10 +17,10 @@ import {
   Expandable,
   EXPANDABLE_FORM_STYLES,
   FieldCheckbox,
+  Form,
   Group,
   GroupItem,
   InputField,
-  SubmittingForm,
   Switch,
   useAdministrationSettings,
   useResource,
@@ -37,7 +37,7 @@ import { authTypes } from './authTypes';
 import { SSHKeyUploader } from './SSHKeyUploader';
 
 const SSH_STYLES = css`
-  SubmittingForm {
+  Form {
     display: flex;
     flex-direction: column;
     flex: 1;
@@ -93,7 +93,7 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({ st
   }, []);
 
   return styled(styles)(
-    <SubmittingForm>
+    <Form>
       <ColoredContainer parent>
         <Group form gap keepSize large>
           <Switch name="enabled" state={handlerState} mod={['primary']} disabled={disabled || readonly}>
@@ -215,6 +215,6 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({ st
           </GroupItem>
         </Group>
       </ColoredContainer>
-    </SubmittingForm>,
+    </Form>,
   );
 });
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSL/ConnectionSSLTabService.ts b/webapp/packages/plugin-connections/src/ConnectionForm/SSL/ConnectionSSLTabService.ts
index 760f7350ab..ce2f2c3592 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSL/ConnectionSSLTabService.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSL/ConnectionSSLTabService.ts
@@ -12,13 +12,13 @@ import { DBDriverResource, NetworkHandlerResource } from '@cloudbeaver/core-conn
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import type { IExecutionContextProvider } from '@cloudbeaver/core-executor';
 import { CachedMapAllKey, type NetworkHandlerConfigInput } from '@cloudbeaver/core-sdk';
+import { formStateContext } from '@cloudbeaver/core-ui';
 import { isNotNullDefined, isObjectsEqual } from '@cloudbeaver/core-utils';
 
 import { connectionFormConfigureContext } from '../connectionFormConfigureContext';
 import { ConnectionFormService } from '../ConnectionFormService';
 import { connectionConfigContext } from '../Contexts/connectionConfigContext';
 import { connectionCredentialsStateContext } from '../Contexts/connectionCredentialsStateContext';
-import { connectionFormStateContext } from '../Contexts/connectionFormStateContext';
 import type { IConnectionFormFillConfigData, IConnectionFormState, IConnectionFormSubmitData } from '../IConnectionFormProps';
 import { getSSLDefaultConfig } from './getSSLDefaultConfig';
 import { getSSLDriverHandler } from './getSSLDriverHandler';
@@ -192,7 +192,7 @@ export class ConnectionSSLTabService extends Bootstrap {
   private formState(data: IConnectionFormState, contexts: IExecutionContextProvider<IConnectionFormState>) {
     const config = contexts.getContext(connectionConfigContext);
     if (config.networkHandlersConfig !== undefined) {
-      const stateContext = contexts.getContext(connectionFormStateContext);
+      const stateContext = contexts.getContext(formStateContext);
 
       stateContext.markEdited();
     }
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSL/SSL.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/SSL/SSL.tsx
index 556b694239..0935e9c0b3 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSL/SSL.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSL/SSL.tsx
@@ -12,10 +12,10 @@ import styled, { css } from 'reshadow';
 import {
   ColoredContainer,
   FieldCheckbox,
+  Form,
   Group,
   GroupTitle,
   ObjectPropertyInfoForm,
-  SubmittingForm,
   Switch,
   useAdministrationSettings,
   useObjectPropertyCategories,
@@ -30,7 +30,7 @@ import type { IConnectionFormProps } from '../IConnectionFormProps';
 import { SAVED_VALUE_INDICATOR } from './SAVED_VALUE_INDICATOR';
 
 const SSl_STYLES = css`
-  SubmittingForm {
+  Form {
     display: flex;
     flex-direction: column;
     flex: 1;
@@ -58,7 +58,7 @@ export const SSL: TabContainerPanelComponent<Props> = observer(function SSL({ st
   const autofillToken = isSafari ? 'section-connection-authentication-ssl section-ssl' : 'new-password';
 
   return styled(styles)(
-    <SubmittingForm>
+    <Form>
       <ColoredContainer parent>
         <Group gap form large vertical>
           <Switch name="enabled" state={handlerState} description={handler.description} mod={['primary']} disabled={disabled || readonly}>
@@ -107,6 +107,6 @@ export const SSL: TabContainerPanelComponent<Props> = observer(function SSL({ st
           )}
         </Group>
       </ColoredContainer>
-    </SubmittingForm>,
+    </Form>,
   );
 });
diff --git a/webapp/packages/plugin-connections/src/ContextMenu/ConnectionMenuBootstrap.ts b/webapp/packages/plugin-connections/src/ContextMenu/ConnectionMenuBootstrap.ts
index e6b3a007f1..5a907da27d 100644
--- a/webapp/packages/plugin-connections/src/ContextMenu/ConnectionMenuBootstrap.ts
+++ b/webapp/packages/plugin-connections/src/ContextMenu/ConnectionMenuBootstrap.ts
@@ -24,15 +24,7 @@ import {
   ServerConfigResource,
 } from '@cloudbeaver/core-root';
 import { getCachedMapResourceLoaderState } from '@cloudbeaver/core-sdk';
-import {
-  ACTION_DELETE,
-  ActionService,
-  DATA_CONTEXT_LOADABLE_STATE,
-  DATA_CONTEXT_MENU,
-  DATA_CONTEXT_MENU_NESTED,
-  MenuSeparatorItem,
-  MenuService,
-} from '@cloudbeaver/core-view';
+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';
@@ -215,12 +207,14 @@ export class ConnectionMenuBootstrap extends Bootstrap {
         return false;
       },
       getLoader: (context, action) => {
-        const state = context.get(DATA_CONTEXT_LOADABLE_STATE);
         const connection = context.get(DATA_CONTEXT_CONNECTION);
 
         if (action === ACTION_CONNECTION_CHANGE_CREDENTIALS) {
-          return state.getState(action.id, () =>
-            getCachedMapResourceLoaderState(this.connectionInfoResource, createConnectionParam(connection), ['includeCredentialsSaved'], true),
+          return getCachedMapResourceLoaderState(
+            this.connectionInfoResource,
+            () => createConnectionParam(connection),
+            () => ['includeCredentialsSaved' as const],
+            true,
           );
         }
 
diff --git a/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseAuthDialog.tsx b/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseAuthDialog.tsx
index 720b171a5b..bf170d379b 100644
--- a/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseAuthDialog.tsx
+++ b/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseAuthDialog.tsx
@@ -7,7 +7,7 @@
  */
 import { observer } from 'mobx-react-lite';
 
-import { ErrorMessage, Loader, s, SubmittingForm, useAdministrationSettings, useFocus, useS } from '@cloudbeaver/core-blocks';
+import { ErrorMessage, Form, Loader, s, useAdministrationSettings, useFocus, useS } from '@cloudbeaver/core-blocks';
 import { IConnectionInfoParams, useConnectionInfo, useDBDriver } from '@cloudbeaver/core-connections';
 import { useController } from '@cloudbeaver/core-di';
 import { CommonDialogBody, CommonDialogFooter, CommonDialogHeader, CommonDialogWrapper, DialogComponent } from '@cloudbeaver/core-dialogs';
@@ -47,7 +47,7 @@ export const DatabaseAuthDialog: DialogComponent<Payload> = observer(function Da
         onReject={options?.persistent ? undefined : rejectDialog}
       />
       <CommonDialogBody>
-        <SubmittingForm ref={focusedRef} className={s(styles, { submittingForm: true })} onSubmit={controller.login}>
+        <Form ref={focusedRef} className={s(styles, { submittingForm: true })} onSubmit={controller.login}>
           {!connection.isLoaded() || connection.isLoading() || !controller.configured ? (
             <Loader />
           ) : (
@@ -63,7 +63,7 @@ export const DatabaseAuthDialog: DialogComponent<Payload> = observer(function Da
               hideFeatures={['nonSecuredProperty']}
             />
           )}
-        </SubmittingForm>
+        </Form>
       </CommonDialogBody>
       <CommonDialogFooter>
         <DBAuthDialogFooter isAuthenticating={controller.isAuthenticating} onLogin={controller.login}>
diff --git a/webapp/packages/plugin-connections/src/index.ts b/webapp/packages/plugin-connections/src/index.ts
index d84ec4ffcc..04b25664f1 100644
--- a/webapp/packages/plugin-connections/src/index.ts
+++ b/webapp/packages/plugin-connections/src/index.ts
@@ -12,7 +12,6 @@ export * from './ConnectionForm/connectionFormConfigureContext';
 export * from './ConnectionForm/ConnectionFormLoader';
 export * from './ConnectionForm/ConnectionFormService';
 export * from './ConnectionForm/ConnectionFormState';
-export * from './ConnectionForm/Contexts/connectionFormStateContext';
 export * from './ConnectionForm/IConnectionFormProps';
 export * from './ConnectionForm/useConnectionFormState';
 export * from './ContextMenu/DATA_CONTEXT_CONNECTION';
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/Actions/ACTION_DATA_VIEWER_GROUPING_CONFIGURE.ts b/webapp/packages/plugin-data-viewer-result-set-grouping/src/Actions/ACTION_DATA_VIEWER_GROUPING_CONFIGURE.ts
old mode 100755
new mode 100644
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/Actions/ACTION_DATA_VIEWER_GROUPING_SHOW_DUPLICATES.ts b/webapp/packages/plugin-data-viewer-result-set-grouping/src/Actions/ACTION_DATA_VIEWER_GROUPING_SHOW_DUPLICATES.ts
old mode 100755
new mode 100644
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/DVGroupingColumnEditorDialog/DVGroupingColumnEditorDialog.m.css b/webapp/packages/plugin-data-viewer-result-set-grouping/src/DVGroupingColumnEditorDialog/DVGroupingColumnEditorDialog.m.css
old mode 100755
new mode 100644
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/DVGroupingColumnEditorDialog/DVGroupingColumnEditorDialog.tsx b/webapp/packages/plugin-data-viewer-result-set-grouping/src/DVGroupingColumnEditorDialog/DVGroupingColumnEditorDialog.tsx
old mode 100755
new mode 100644
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/DVGroupingColumnEditorDialog/GroupingColumnEditorTable.m.css b/webapp/packages/plugin-data-viewer-result-set-grouping/src/DVGroupingColumnEditorDialog/GroupingColumnEditorTable.m.css
old mode 100755
new mode 100644
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/DVGroupingColumnEditorDialog/GroupingColumnEditorTable.tsx b/webapp/packages/plugin-data-viewer-result-set-grouping/src/DVGroupingColumnEditorDialog/GroupingColumnEditorTable.tsx
old mode 100755
new mode 100644
index 0a84e4381c..15263189d7
--- a/webapp/packages/plugin-data-viewer-result-set-grouping/src/DVGroupingColumnEditorDialog/GroupingColumnEditorTable.tsx
+++ b/webapp/packages/plugin-data-viewer-result-set-grouping/src/DVGroupingColumnEditorDialog/GroupingColumnEditorTable.tsx
@@ -8,7 +8,7 @@
 import { observer } from 'mobx-react-lite';
 import { useState } from 'react';
 
-import { Button, Container, Group, GroupTitle, InputField, s, SubmittingForm, Table, TableBody, useS } from '@cloudbeaver/core-blocks';
+import { Button, Container, Form, Group, GroupTitle, InputField, s, Table, TableBody, useS } from '@cloudbeaver/core-blocks';
 
 import styles from './GroupingColumnEditorTable.m.css';
 import { GroupingTableItem } from './GroupingTableItem';
@@ -36,29 +36,29 @@ export const GroupingColumnEditorTable = observer<Props>(function GroupingColumn
 
   return (
     <Group box medium overflow>
-        <Container className={s(style, { header: true })}>
-          <GroupTitle>{title}</GroupTitle>
-          <SubmittingForm className={s(style, { headerActions: true })} onSubmit={addColumnHandler}>
-              <InputField
-                className={s(style, { inputField: true })}
-                placeholder={placeholder}
-                value={newColumnName}
-                onChange={v => setNewColumnName(String(v))}
-              />
-              <Button mod={['unelevated']} onClick={addColumnHandler}>
-                +
-              </Button>
-          </SubmittingForm>
-        </Container>
-        <Container className={s(style, { tableContainer: true })} overflow>
-          <Table keys={columns}>
-            <TableBody>
-              {columns.map((name, idx) => (
-                <GroupingTableItem key={idx} id={name} name={name} onDelete={onDelete} />
-              ))}
-            </TableBody>
-          </Table>
-        </Container>
+      <Container className={s(style, { header: true })}>
+        <GroupTitle>{title}</GroupTitle>
+        <Form className={s(style, { headerActions: true })} onSubmit={addColumnHandler}>
+          <InputField
+            className={s(style, { inputField: true })}
+            placeholder={placeholder}
+            value={newColumnName}
+            onChange={v => setNewColumnName(String(v))}
+          />
+          <Button mod={['unelevated']} onClick={addColumnHandler}>
+            +
+          </Button>
+        </Form>
+      </Container>
+      <Container className={s(style, { tableContainer: true })} overflow>
+        <Table keys={columns}>
+          <TableBody>
+            {columns.map((name, idx) => (
+              <GroupingTableItem key={idx} id={name} name={name} onDelete={onDelete} />
+            ))}
+          </TableBody>
+        </Table>
+      </Container>
     </Group>
   );
 });
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/DVGroupingColumnEditorDialog/GroupingTableItem.tsx b/webapp/packages/plugin-data-viewer-result-set-grouping/src/DVGroupingColumnEditorDialog/GroupingTableItem.tsx
old mode 100755
new mode 100644
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/DVResultSetGroupingPluginBootstrap.ts b/webapp/packages/plugin-data-viewer-result-set-grouping/src/DVResultSetGroupingPluginBootstrap.ts
old mode 100755
new mode 100644
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/DVResultSetGroupingPresentation.tsx b/webapp/packages/plugin-data-viewer-result-set-grouping/src/DVResultSetGroupingPresentation.tsx
old mode 100755
new mode 100644
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/DataContext/DATA_CONTEXT_DV_DDM_RS_GROUPING.ts b/webapp/packages/plugin-data-viewer-result-set-grouping/src/DataContext/DATA_CONTEXT_DV_DDM_RS_GROUPING.ts
old mode 100755
new mode 100644
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/GroupingDataSource.ts b/webapp/packages/plugin-data-viewer-result-set-grouping/src/GroupingDataSource.ts
old mode 100755
new mode 100644
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/IGroupingQueryState.ts b/webapp/packages/plugin-data-viewer-result-set-grouping/src/IGroupingQueryState.ts
old mode 100755
new mode 100644
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/locales/en.ts b/webapp/packages/plugin-data-viewer-result-set-grouping/src/locales/en.ts
old mode 100755
new mode 100644
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/locales/it.ts b/webapp/packages/plugin-data-viewer-result-set-grouping/src/locales/it.ts
old mode 100755
new mode 100644
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/locales/ru.ts b/webapp/packages/plugin-data-viewer-result-set-grouping/src/locales/ru.ts
old mode 100755
new mode 100644
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/locales/zh.ts b/webapp/packages/plugin-data-viewer-result-set-grouping/src/locales/zh.ts
old mode 100755
new mode 100644
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/useGroupingDataModel.ts b/webapp/packages/plugin-data-viewer-result-set-grouping/src/useGroupingDataModel.ts
old mode 100755
new mode 100644
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/AutoRefresh/AutoRefreshSettingsDialog.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/AutoRefresh/AutoRefreshSettingsDialog.tsx
index 7c871a1f5a..02eb42b9af 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/AutoRefresh/AutoRefreshSettingsDialog.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/AutoRefresh/AutoRefreshSettingsDialog.tsx
@@ -8,7 +8,7 @@
 import { observer } from 'mobx-react-lite';
 import { useRef } from 'react';
 
-import { Button, Container, FieldCheckbox, Fill, Group, InputField, s, SubmittingForm, useS, useTranslate } from '@cloudbeaver/core-blocks';
+import { Button, Container, FieldCheckbox, Fill, Form, Group, InputField, s, useS, useTranslate } from '@cloudbeaver/core-blocks';
 import { CommonDialogBody, CommonDialogFooter, CommonDialogHeader, CommonDialogWrapper, DialogComponentProps } from '@cloudbeaver/core-dialogs';
 
 import style from './AutoRefreshSettingsDialog.m.css';
@@ -42,7 +42,7 @@ export const AutoRefreshSettingsDialog = observer<DialogComponentProps<Payload>>
       <CommonDialogHeader title="data_viewer_auto_refresh_settings" icon="/icons/settings_cog_m.svg" onReject={rejectDialog} />
       <CommonDialogBody noBodyPadding noOverflow>
         <div className={s(styles, { wrapper: true })}>
-          <SubmittingForm ref={formRef} onSubmit={() => resolve()}>
+          <Form ref={formRef} onSubmit={() => resolve()}>
             <Container>
               <Group form gap>
                 <InputField name="interval" state={payload.settings} type="number" min={5} max={3600}>
@@ -54,7 +54,7 @@ export const AutoRefreshSettingsDialog = observer<DialogComponentProps<Payload>>
                 </FieldCheckbox>
               </Group>
             </Container>
-          </SubmittingForm>
+          </Form>
         </div>
       </CommonDialogBody>
       <CommonDialogFooter>
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooter.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooter.tsx
index 0e13a5ae3f..2bf3b50bea 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooter.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooter.tsx
@@ -9,7 +9,7 @@ import { observer } from 'mobx-react-lite';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import styled, { css, use } from 'reshadow';
 
-import { getComputed, SubmittingForm, ToolsPanel } from '@cloudbeaver/core-blocks';
+import { Form, getComputed, ToolsPanel } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import type { IDataContext } from '@cloudbeaver/core-view';
 
@@ -108,7 +108,7 @@ export const TableFooter = observer<Props>(function TableFooter({ resultIndex, m
       </reload> */}
       <AutoRefreshButton model={model} disabled={disabled} />
       <count>
-        <SubmittingForm onSubmit={handleChange}>
+        <Form onSubmit={handleChange}>
           <input
             ref={ref}
             type="number"
@@ -120,7 +120,7 @@ export const TableFooter = observer<Props>(function TableFooter({ resultIndex, m
             onBlur={handleChange}
             {...use({ mod: 'surface' })}
           />
-        </SubmittingForm>
+        </Form>
       </count>
       <TableFooterMenu model={model} resultIndex={resultIndex} simple={simple} context={context} />
       {model.source.requestInfo.requestMessage.length > 0 && (
diff --git a/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSchemaManagerBootstrap.ts b/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSchemaManagerBootstrap.ts
index 32e2cc02f7..6c25038a2e 100644
--- a/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSchemaManagerBootstrap.ts
+++ b/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSchemaManagerBootstrap.ts
@@ -20,14 +20,7 @@ import { LocalizationService } from '@cloudbeaver/core-localization';
 import { EObjectFeature, NodeManagerUtils } from '@cloudbeaver/core-navigation-tree';
 import { getCachedMapResourceLoaderState } from '@cloudbeaver/core-sdk';
 import { OptionsPanelService } from '@cloudbeaver/core-ui';
-import {
-  DATA_CONTEXT_LOADABLE_STATE,
-  DATA_CONTEXT_MENU,
-  MenuBaseItem,
-  menuExtractItems,
-  MenuSeparatorItem,
-  MenuService,
-} from '@cloudbeaver/core-view';
+import { DATA_CONTEXT_MENU, MenuBaseItem, menuExtractItems, MenuSeparatorItem, MenuService } from '@cloudbeaver/core-view';
 import { MENU_APP_ACTIONS } from '@cloudbeaver/plugin-top-app-bar';
 
 import { ConnectionSchemaManagerService } from './ConnectionSchemaManagerService';
@@ -91,24 +84,19 @@ export class ConnectionSchemaManagerBootstrap extends Bootstrap {
           return [];
         }
 
-        const state = context.get(DATA_CONTEXT_LOADABLE_STATE);
+        const activeConnectionKey = this.connectionSchemaManagerService.activeConnectionKey;
 
-        return state.getState(menu.id, () => {
-          if (!this.connectionSchemaManagerService.activeConnectionKey) {
-            return this.appAuthService.loaders;
-          }
-          return [
-            ...this.appAuthService.loaders,
-            getCachedMapResourceLoaderState(
-              this.containerResource,
-              {
-                ...this.connectionSchemaManagerService.activeConnectionKey,
-                catalogId: this.connectionSchemaManagerService.activeObjectCatalogId,
-              },
-              undefined,
-            ),
-          ];
-        });
+        if (!activeConnectionKey) {
+          return this.appAuthService.loaders;
+        }
+
+        return [
+          ...this.appAuthService.loaders,
+          getCachedMapResourceLoaderState(this.containerResource, () => ({
+            ...activeConnectionKey,
+            catalogId: this.connectionSchemaManagerService.activeObjectCatalogId,
+          })),
+        ];
       },
     });
 
@@ -193,9 +181,7 @@ export class ConnectionSchemaManagerBootstrap extends Bootstrap {
           return [];
         }
 
-        const state = context.get(DATA_CONTEXT_LOADABLE_STATE);
-
-        return state.getState(menu.id, () => this.appAuthService.loaders);
+        return this.appAuthService.loaders;
       },
       hideIfEmpty: () => false,
       getInfo: (context, menu) => {
diff --git a/webapp/packages/plugin-navigation-tree-filters/src/NavigationTreeFiltersDialog/FiltersTable.tsx b/webapp/packages/plugin-navigation-tree-filters/src/NavigationTreeFiltersDialog/FiltersTable.tsx
index 97d1a1f526..fac3c997e4 100644
--- a/webapp/packages/plugin-navigation-tree-filters/src/NavigationTreeFiltersDialog/FiltersTable.tsx
+++ b/webapp/packages/plugin-navigation-tree-filters/src/NavigationTreeFiltersDialog/FiltersTable.tsx
@@ -8,7 +8,7 @@
 import { observer } from 'mobx-react-lite';
 import { useState } from 'react';
 
-import { Button, Group, InputField, s, SubmittingForm, Table, TableBody, useS, useTranslate } from '@cloudbeaver/core-blocks';
+import { Button, Form, Group, InputField, s, Table, TableBody, useS, useTranslate } from '@cloudbeaver/core-blocks';
 
 import styles from './FiltersTable.m.css';
 import { FiltersTableItem } from './FiltersTableItem';
@@ -39,7 +39,7 @@ export const FiltersTable = observer<Props>(function FiltersTable({ title, filte
       <div className={s(style, { container: true })}>
         <header className={s(style, { header: true })}>
           <h4 className={s(style, { headerTitle: true })}>{title}</h4>
-          <SubmittingForm className={s(style, { submittingForm: true })} onSubmit={add}>
+          <Form className={s(style, { submittingForm: true })} onSubmit={add}>
             <div className={s(style, { headerActions: true })}>
               <InputField
                 className={s(style, { inputField: true })}
@@ -51,7 +51,7 @@ export const FiltersTable = observer<Props>(function FiltersTable({ title, filte
                 +
               </Button>
             </div>
-          </SubmittingForm>
+          </Form>
         </header>
         <div className={s(style, { tableContainer: true })}>
           <Table className={s(style, { table: true })} keys={filters}>
diff --git a/webapp/packages/plugin-navigation-tree-rm/src/NavNodes/ResourceFoldersBootstrap.ts b/webapp/packages/plugin-navigation-tree-rm/src/NavNodes/ResourceFoldersBootstrap.ts
index 1f18242b79..5f3891f5bb 100644
--- a/webapp/packages/plugin-navigation-tree-rm/src/NavNodes/ResourceFoldersBootstrap.ts
+++ b/webapp/packages/plugin-navigation-tree-rm/src/NavNodes/ResourceFoldersBootstrap.ts
@@ -33,15 +33,7 @@ import {
 } from '@cloudbeaver/core-resource-manager';
 import { CachedMapAllKey, CachedTreeChildrenKey, getCachedMapResourceLoaderState, resourceKeyList, ResourceKeyUtils } from '@cloudbeaver/core-sdk';
 import { createPath, getPathParent } from '@cloudbeaver/core-utils';
-import {
-  ACTION_NEW_FOLDER,
-  ActionService,
-  DATA_CONTEXT_LOADABLE_STATE,
-  DATA_CONTEXT_MENU,
-  IAction,
-  IDataContextProvider,
-  MenuService,
-} from '@cloudbeaver/core-view';
+import { ACTION_NEW_FOLDER, ActionService, DATA_CONTEXT_MENU, IAction, IDataContextProvider, MenuService } from '@cloudbeaver/core-view';
 import { DATA_CONTEXT_ELEMENTS_TREE, MENU_ELEMENTS_TREE_TOOLS } from '@cloudbeaver/plugin-navigation-tree';
 import { FolderDialog } from '@cloudbeaver/plugin-projects';
 import { ResourceManagerService } from '@cloudbeaver/plugin-resource-manager';
@@ -96,9 +88,7 @@ export class ResourceFoldersBootstrap extends Bootstrap {
         return true;
       },
       getLoader: (context, action) => {
-        const state = context.get(DATA_CONTEXT_LOADABLE_STATE);
-
-        return state.getState(action.id, () => getCachedMapResourceLoaderState(this.projectInfoResource, CachedMapAllKey));
+        return getCachedMapResourceLoaderState(this.projectInfoResource, () => CachedMapAllKey);
       },
       isDisabled: context => this.getTargetNode(context) === undefined,
       handler: this.elementsTreeActionHandler.bind(this),
diff --git a/webapp/packages/plugin-projects/src/FolderDialog.tsx b/webapp/packages/plugin-projects/src/FolderDialog.tsx
index 437cc4a4e5..1637783dad 100644
--- a/webapp/packages/plugin-projects/src/FolderDialog.tsx
+++ b/webapp/packages/plugin-projects/src/FolderDialog.tsx
@@ -13,9 +13,9 @@ import {
   Button,
   Container,
   Fill,
+  Form,
   InputField,
   s,
-  SubmittingForm,
   Translate,
   useFocus,
   useObservableRef,
@@ -156,7 +156,7 @@ export const FolderDialog: DialogComponent<FolderDialogPayload, IFolderDialogRes
     <CommonDialogWrapper size="small" className={className} fixedWidth>
       <CommonDialogHeader subTitle={subTitle} title={title} icon={icon} viewBox={viewBox} bigIcon={bigIcon} onReject={rejectDialog} />
       <CommonDialogBody>
-        <SubmittingForm ref={focusedRef} onSubmit={resolveHandler}>
+        <Form ref={focusedRef} onSubmit={resolveHandler}>
           <Container center gap>
             {selectProject && <ProjectSelect value={state.projectId} filter={filterProject} onChange={projectId => state.setProjectId(projectId)} />}
             <InputField
@@ -170,7 +170,7 @@ export const FolderDialog: DialogComponent<FolderDialogPayload, IFolderDialogRes
               {translate('ui_name') + ':'}
             </InputField>
           </Container>
-        </SubmittingForm>
+        </Form>
       </CommonDialogBody>
       <CommonDialogFooter className={s(styles, { footer: true })}>
         <Button type="button" mod={['outlined']} onClick={rejectDialog}>
diff --git a/webapp/packages/plugin-resource-manager-scripts/src/PluginBootstrap.ts b/webapp/packages/plugin-resource-manager-scripts/src/PluginBootstrap.ts
index e54ba7fbca..03d8b3a1b8 100644
--- a/webapp/packages/plugin-resource-manager-scripts/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-resource-manager-scripts/src/PluginBootstrap.ts
@@ -9,7 +9,7 @@ import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { ServerConfigResource } from '@cloudbeaver/core-root';
 import { getCachedDataResourceLoaderState } from '@cloudbeaver/core-sdk';
 import { SideBarPanelService } from '@cloudbeaver/core-ui';
-import { ActionService, DATA_CONTEXT_LOADABLE_STATE, DATA_CONTEXT_MENU, menuExtractItems, MenuService } from '@cloudbeaver/core-view';
+import { ActionService, DATA_CONTEXT_MENU, menuExtractItems, MenuService } from '@cloudbeaver/core-view';
 import { MENU_TOOLS } from '@cloudbeaver/plugin-tools-panel';
 
 import { ACTION_RESOURCE_MANAGER_SCRIPTS } from './Actions/ACTION_RESOURCE_MANAGER_SCRIPTS';
@@ -58,9 +58,7 @@ export class PluginBootstrap extends Bootstrap {
       isHidden: () => !this.resourceManagerScriptsService.enabled,
       isChecked: () => this.resourceManagerScriptsService.active,
       getLoader: (context, action) => {
-        const state = context.get(DATA_CONTEXT_LOADABLE_STATE);
-
-        return state.getState(action.id, () => getCachedDataResourceLoaderState(this.serverConfigResource, undefined, undefined));
+        return getCachedDataResourceLoaderState(this.serverConfigResource, undefined, undefined);
       },
       handler: (context, action) => {
         switch (action) {
diff --git a/webapp/packages/plugin-resource-manager-scripts/src/SaveScriptDialog.tsx b/webapp/packages/plugin-resource-manager-scripts/src/SaveScriptDialog.tsx
index a3b0da61bd..c968d4ffb3 100644
--- a/webapp/packages/plugin-resource-manager-scripts/src/SaveScriptDialog.tsx
+++ b/webapp/packages/plugin-resource-manager-scripts/src/SaveScriptDialog.tsx
@@ -8,7 +8,7 @@
 import { action, observable } from 'mobx';
 import { observer } from 'mobx-react-lite';
 
-import { Button, Container, Fill, InputField, SubmittingForm, Translate, useFocus, useObservableRef, useTranslate } from '@cloudbeaver/core-blocks';
+import { Button, Container, Fill, Form, InputField, Translate, useFocus, useObservableRef, useTranslate } from '@cloudbeaver/core-blocks';
 import { CommonDialogBody, CommonDialogFooter, CommonDialogHeader, CommonDialogWrapper, DialogComponent } from '@cloudbeaver/core-dialogs';
 import { ProjectSelect } from '@cloudbeaver/plugin-projects';
 
@@ -83,7 +83,7 @@ export const SaveScriptDialog: DialogComponent<Payload, ISaveScriptDialogResult>
     <CommonDialogWrapper size="small" className={className} fixedWidth>
       <CommonDialogHeader title={translate('plugin_resource_manager_scripts_save_script')} icon="/icons/sql_script_m.svg" onReject={rejectDialog} />
       <CommonDialogBody>
-        <SubmittingForm ref={focusedRef} onSubmit={state.submit}>
+        <Form ref={focusedRef} onSubmit={state.submit}>
           <Container center gap>
             <ProjectSelect
               value={state.projectId}
@@ -108,7 +108,7 @@ export const SaveScriptDialog: DialogComponent<Payload, ISaveScriptDialogResult>
               {translate('ui_name') + ':'}
             </InputField>
           </Container>
-        </SubmittingForm>
+        </Form>
       </CommonDialogBody>
       <CommonDialogFooter>
         <Button type="button" mod={['outlined']} onClick={rejectDialog}>
diff --git a/webapp/packages/plugin-sql-generator/src/SqlGenerators/SqlGeneratorsBootstrap.ts b/webapp/packages/plugin-sql-generator/src/SqlGenerators/SqlGeneratorsBootstrap.ts
index df8a8b38d4..33ba3374ab 100644
--- a/webapp/packages/plugin-sql-generator/src/SqlGenerators/SqlGeneratorsBootstrap.ts
+++ b/webapp/packages/plugin-sql-generator/src/SqlGenerators/SqlGeneratorsBootstrap.ts
@@ -9,7 +9,7 @@ import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService } from '@cloudbeaver/core-dialogs';
 import { DATA_CONTEXT_NAV_NODE, EObjectFeature } from '@cloudbeaver/core-navigation-tree';
 import { getCachedMapResourceLoaderState } from '@cloudbeaver/core-sdk';
-import { DATA_CONTEXT_LOADABLE_STATE, DATA_CONTEXT_MENU, DATA_CONTEXT_MENU_NESTED, MenuBaseItem, MenuService } from '@cloudbeaver/core-view';
+import { DATA_CONTEXT_MENU, DATA_CONTEXT_MENU_NESTED, MenuBaseItem, MenuService } from '@cloudbeaver/core-view';
 
 import { GeneratedSqlDialog } from './GeneratedSqlDialog';
 import { MENU_SQL_GENERATORS } from './MENU_SQL_GENERATORS';
@@ -36,9 +36,8 @@ export class SqlGeneratorsBootstrap extends Bootstrap {
       },
       getLoader: (context, action) => {
         const node = context.get(DATA_CONTEXT_NAV_NODE);
-        const state = context.get(DATA_CONTEXT_LOADABLE_STATE);
 
-        return state.getState(action.id, () => getCachedMapResourceLoaderState(this.sqlGeneratorsResource, node.id));
+        return getCachedMapResourceLoaderState(this.sqlGeneratorsResource, () => node.id);
       },
     });
     this.menuService.addCreator({
diff --git a/webapp/packages/plugin-user-profile/src/UserProfileForm/IUserProfileFormState.ts b/webapp/packages/plugin-user-profile/src/UserProfileForm/IUserProfileFormState.ts
index a4fc1c74fa..bea185e89b 100644
--- a/webapp/packages/plugin-user-profile/src/UserProfileForm/IUserProfileFormState.ts
+++ b/webapp/packages/plugin-user-profile/src/UserProfileForm/IUserProfileFormState.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 type { IFormStateInfo } from '@cloudbeaver/core-blocks';
+import type { IFormStateInfo } from '@cloudbeaver/core-ui';
 
 export interface IUserProfileFormState {
   info: IFormStateInfo;
diff --git a/webapp/packages/plugin-user-profile/src/UserProfileForm/UserForm.tsx b/webapp/packages/plugin-user-profile/src/UserProfileForm/UserForm.tsx
index e2f1b09483..73b4f62b51 100644
--- a/webapp/packages/plugin-user-profile/src/UserProfileForm/UserForm.tsx
+++ b/webapp/packages/plugin-user-profile/src/UserProfileForm/UserForm.tsx
@@ -9,7 +9,8 @@ import { observer } from 'mobx-react-lite';
 import styled, { css } from 'reshadow';
 
 import { AUTH_PROVIDER_LOCAL_ID } from '@cloudbeaver/core-authentication';
-import { Button, IconOrImage, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
+import { Button, IconOrImage, StatusMessage, useStyles, useTranslate } from '@cloudbeaver/core-blocks';
+import { ENotificationType } from '@cloudbeaver/core-events';
 import type { UserInfo } from '@cloudbeaver/core-sdk';
 import { BASE_TAB_STYLES, TabList, TabsState, UNDERLINE_TAB_BIG_STYLES, UNDERLINE_TAB_STYLES } from '@cloudbeaver/core-ui';
 
@@ -113,12 +114,7 @@ export const UserForm = observer<Props>(function UserForm({ user, state, onClose
         <top-bar>
           <top-bar-tabs>
             <status-message>
-              {state.info.statusMessage && (
-                <>
-                  <IconOrImage icon="/icons/info_icon.svg" />
-                  {translate(state.info.statusMessage)}
-                </>
-              )}
+              <StatusMessage type={ENotificationType.Info} message={state.info.statusMessage} />
             </status-message>
             <TabList aria-label="User Settings" style={style} disabled={state.info.disabled}>
               <UserInfoTab style={style} />
diff --git a/webapp/packages/plugin-user-profile/src/UserProfileForm/UserProfileFormState.ts b/webapp/packages/plugin-user-profile/src/UserProfileForm/UserProfileFormState.ts
index 358e9cfa14..9155753ef0 100644
--- a/webapp/packages/plugin-user-profile/src/UserProfileForm/UserProfileFormState.ts
+++ b/webapp/packages/plugin-user-profile/src/UserProfileForm/UserProfileFormState.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 type { IFormStateInfo } from '@cloudbeaver/core-blocks';
+import type { IFormStateInfo } from '@cloudbeaver/core-ui';
 
 import type { IUserProfileFormState } from './IUserProfileFormState';
 
@@ -16,6 +16,7 @@ export class UserProfileFormState implements IUserProfileFormState {
       edited: false,
       readonly: false,
       statusMessage: null,
+      statusType: null,
     };
   }