diff --git a/webapp/packages/plugin-connections/src/ConnectionAuthentication/NetworkHandlerAuthForm.tsx b/webapp/packages/plugin-connections/src/ConnectionAuthentication/NetworkHandlerAuthForm.tsx
index 2b2e60621d..820933e5be 100644
--- a/webapp/packages/plugin-connections/src/ConnectionAuthentication/NetworkHandlerAuthForm.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionAuthentication/NetworkHandlerAuthForm.tsx
@@ -67,7 +67,7 @@ export const NetworkHandlerAuthForm = observer<Props>(function NetworkHandlerAut
       )}
       {allowSaveCredentials && (
         <FieldCheckbox
-          id={id + ' savePassword'}
+          id={id + '_savePassword'}
           name="savePassword"
           state={state}
           label={translate('connections_connection_edit_save_credentials')}
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
index 483936d90b..a55b66e60c 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
@@ -111,26 +111,10 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({ st
             {translate('connections_network_handler_ssh_tunnel_auth_type')}
           </Combobox>
           <Container wrap gap>
-            <InputField
-              type="text"
-              name="host"
-              state={handlerState.properties}
-              disabled={disabled || !enabled}
-              readOnly={readonly}
-              required
-              small
-            >
+            <InputField type="text" name="host" state={handlerState.properties} disabled={disabled || !enabled} readOnly={readonly} required small>
               {translate('connections_network_handler_ssh_tunnel_host')}
             </InputField>
-            <InputField
-              type="number"
-              name="port"
-              state={handlerState.properties}
-              disabled={disabled || !enabled}
-              readOnly={readonly}
-              required
-              tiny
-            >
+            <InputField type="number" name="port" state={handlerState.properties} disabled={disabled || !enabled} readOnly={readonly} required tiny>
               {translate('connections_network_handler_ssh_tunnel_port')}
             </InputField>
           </Container>
@@ -165,7 +149,7 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({ st
           </Container>
           {credentialsSavingEnabled && !formState.config.template && (
             <FieldCheckbox
-              id={SSH_TUNNEL_ID + ' savePassword'}
+              id={SSH_TUNNEL_ID + '_savePassword'}
               name="savePassword"
               state={handlerState}
               disabled={disabled || !enabled || readonly || formState.config.sharedCredentials}
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSL/SSL.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/SSL/SSL.tsx
index 14d206c68a..6d18cc0bf8 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSL/SSL.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSL/SSL.tsx
@@ -61,7 +61,14 @@ export const SSL: TabContainerPanelComponent<Props> = observer(function SSL({ st
     <Form>
       <ColoredContainer parent>
         <Group gap form large vertical>
-          <Switch id="ssl-enable-switch" name="enabled" state={handlerState} description={handler.description} mod={['primary']} disabled={disabled || readonly}>
+          <Switch
+            id="ssl-enable-switch"
+            name="enabled"
+            state={handlerState}
+            description={handler.description}
+            mod={['primary']}
+            disabled={disabled || readonly}
+          >
             {translate('connections_public_connection_ssl_enable')}
           </Switch>
           {isUncategorizedExists && (
@@ -97,7 +104,7 @@ export const SSL: TabContainerPanelComponent<Props> = observer(function SSL({ st
 
           {credentialsSavingEnabled && !formState.config.template && (
             <FieldCheckbox
-              id={handler.id + ' savePassword'}
+              id={handler.id + '_savePassword'}
               name="savePassword"
               state={handlerState}
               disabled={disabled || !enabled || readonly || formState.config.sharedCredentials}