diff --git a/webapp/packages/core-connections/src/DatabaseAuthDialog/DBAuthDialogController.ts b/webapp/packages/core-connections/src/DatabaseAuthDialog/DBAuthDialogController.ts
index dfab55f42c..e8bac62a07 100644
--- a/webapp/packages/core-connections/src/DatabaseAuthDialog/DBAuthDialogController.ts
+++ b/webapp/packages/core-connections/src/DatabaseAuthDialog/DBAuthDialogController.ts
@@ -53,10 +53,6 @@ export class DBAuthDialogController implements IInitializableController, IDestru
     this.isDistructed = true;
   }
 
-  onChange = (property: keyof IDBAuthConfig, value: any) => {
-    this.config[property] = value;
-  };
-
   login = async () => {
     if (this.isAuthenticating) {
       return;
diff --git a/webapp/packages/core-connections/src/DatabaseAuthDialog/DatabaseAuthDialog.tsx b/webapp/packages/core-connections/src/DatabaseAuthDialog/DatabaseAuthDialog.tsx
index 442600aa3c..e36eccf1bd 100644
--- a/webapp/packages/core-connections/src/DatabaseAuthDialog/DatabaseAuthDialog.tsx
+++ b/webapp/packages/core-connections/src/DatabaseAuthDialog/DatabaseAuthDialog.tsx
@@ -99,12 +99,11 @@ export const DatabaseAuthDialog = observer(function DatabaseAuthDialog({
                 <FormGroup>
                   <FieldCheckbox
                     name="saveCredentials"
-                    value={connection.connectionInfo?.name || ''}
+                    value={connection.connectionInfo?.name || 'DBAuthSaveCredentials'}
                     checkboxLabel={translate('connections_connection_edit_save_credentials')}
                     disabled={controller.isAuthenticating}
+                    state={controller.config}
                     mod='surface'
-                    checked={controller.config.saveCredentials}
-                    onChange={value => controller.onChange('saveCredentials', value)}
                   />
                 </FormGroup>
               </FormBoxElement>