diff --git a/webapp/packages/core-authentication/src/AuthProvidersResource.ts b/webapp/packages/core-authentication/src/AuthProvidersResource.ts
index e7cd6b60c7..0b43c5fe49 100644
--- a/webapp/packages/core-authentication/src/AuthProvidersResource.ts
+++ b/webapp/packages/core-authentication/src/AuthProvidersResource.ts
@@ -20,7 +20,6 @@ import { ServerConfigResource } from '@cloudbeaver/core-root';
 import { AuthProviderConfigurationInfoFragment, AuthProviderInfoFragment, GraphQLService } from '@cloudbeaver/core-sdk';
 
 import { AuthConfigurationsResource } from './AuthConfigurationsResource';
-import { AuthSettingsService } from './AuthSettingsService';
 
 export type AuthProvider = NonNullable<AuthProviderInfoFragment>;
 export type AuthProviderConfiguration = NonNullable<AuthProviderConfigurationInfoFragment>;
@@ -32,7 +31,6 @@ export class AuthProvidersResource extends CachedMapResource<string, AuthProvide
   }
 
   constructor(
-    private readonly authSettingsService: AuthSettingsService,
     private readonly graphQLService: GraphQLService,
     private readonly serverConfigResource: ServerConfigResource,
     private readonly authConfigurationsResource: AuthConfigurationsResource,
diff --git a/webapp/packages/core-ui/src/Form/FormBaseService.ts b/webapp/packages/core-ui/src/Form/FormBaseService.ts
index 6f25777f8c..15db20bc09 100644
--- a/webapp/packages/core-ui/src/Form/FormBaseService.ts
+++ b/webapp/packages/core-ui/src/Form/FormBaseService.ts
@@ -22,13 +22,17 @@ export class FormBaseService<TState, TProps extends IFormProps<TState> = IFormPr
 
   readonly onConfigure: IExecutorHandlersCollection<IFormState<TState>>;
   readonly onFillDefaultConfig: IExecutorHandlersCollection<IFormState<TState>>;
-  readonly onPrepareConfig: IExecutorHandlersCollection<TState>;
+  readonly onPrepareConfig: IExecutorHandlersCollection<IFormState<TState>>;
   readonly onFormat: IExecutorHandlersCollection<IFormState<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) {
+  constructor(
+    private readonly localizationService: LocalizationService,
+    private readonly notificationService: NotificationService,
+    name: string,
+  ) {
     this.parts = new TabsContainer(name);
     this.actionsContainer = new PlaceholderContainer();
     this.onConfigure = new ExecutorHandlersCollection();
diff --git a/webapp/packages/core-ui/src/Form/FormPart.ts b/webapp/packages/core-ui/src/Form/FormPart.ts
index 2dcf2063d7..964b9fa2c8 100644
--- a/webapp/packages/core-ui/src/Form/FormPart.ts
+++ b/webapp/packages/core-ui/src/Form/FormPart.ts
@@ -37,6 +37,7 @@ export abstract class FormPart<TPartState, TFormState = any> implements IFormPar
     this.loading = false;
 
     this.formState.submitTask.addHandler(executorHandlerFilter(() => this.isLoaded(), this.save.bind(this)));
+    this.formState.fillDefaultConfigTask.addHandler(executorHandlerFilter(() => this.isLoaded(), this.fillConfig.bind(this)));
     this.formState.configureTask.addHandler(executorHandlerFilter(() => this.isLoaded(), this.configure.bind(this)));
     this.formState.formatTask.addHandler(executorHandlerFilter(() => this.isLoaded(), this.format.bind(this)));
     this.formState.validationTask.addHandler(executorHandlerFilter(() => this.isLoaded(), this.validate.bind(this)));
@@ -150,6 +151,7 @@ export abstract class FormPart<TPartState, TFormState = any> implements IFormPar
   protected configure(data: IFormState<TFormState>, contexts: IExecutionContextProvider<IFormState<TFormState>>): void | Promise<void> {}
   protected format(data: IFormState<TFormState>, contexts: IExecutionContextProvider<IFormState<TFormState>>): void | Promise<void> {}
   protected validate(data: IFormState<TFormState>, contexts: IExecutionContextProvider<IFormState<TFormState>>): void | Promise<void> {}
+  protected fillConfig(data: IFormState<TFormState>, contexts: IExecutionContextProvider<IFormState<TFormState>>): void | Promise<void> {}
 
   protected abstract loader(): Promise<void>;
   protected abstract saveChanges(data: IFormState<TFormState>, contexts: IExecutionContextProvider<IFormState<TFormState>>): Promise<void>;