diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/broker-config-control/broker-config-control.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/broker-config-control/broker-config-control.component.ts
index f7d37b167e..d4bfdd4694 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/broker-config-control/broker-config-control.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/broker-config-control/broker-config-control.component.ts
@@ -109,12 +109,13 @@ export class BrokerConfigControlComponent implements ControlValueAccessor, Valid
   }
 
   writeValue(brokerConfig: BrokerConfig): void {
-    const brokerConfigState = {
-      ...brokerConfig,
-      version: brokerConfig.version || 5,
-      clientId: brokerConfig.clientId || 'tb_gw_' + generateSecret(5),
-    };
-    this.brokerConfigFormGroup.reset(brokerConfigState, {emitEvent: false});
+    const {
+      version = 5,
+      clientId = `tb_gw_${generateSecret(5)}`,
+      security = {},
+    } = brokerConfig;
+
+    this.brokerConfigFormGroup.reset({ ...brokerConfig, version, clientId, security }, { emitEvent: false });
     this.cdr.markForCheck();
   }
 
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/opc-server-config/opc-server-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/opc-server-config/opc-server-config.component.ts
index eddad255a3..ff50480b92 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/opc-server-config/opc-server-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/opc-server-config/opc-server-config.component.ts
@@ -85,7 +85,7 @@ export class OpcServerConfigComponent implements ControlValueAccessor, Validator
       subCheckPeriodInMillis: [10, [Validators.required, Validators.min(10)]],
       showMap: [false, []],
       security: [SecurityPolicy.BASIC128, []],
-      identity: [{}, [Validators.required]]
+      identity: []
     });
 
     this.serverConfigFormGroup.valueChanges.pipe(
@@ -116,16 +116,25 @@ export class OpcServerConfigComponent implements ControlValueAccessor, Validator
   }
 
   writeValue(serverConfig: ServerConfig): void {
-    const { timeoutInMillis, scanPeriodInMillis, enableSubscriptions, subCheckPeriodInMillis, showMap, security } = serverConfig;
-    const serverConfigState = {
+    const {
+      timeoutInMillis = 1000,
+      scanPeriodInMillis = 1000,
+      enableSubscriptions = true,
+      subCheckPeriodInMillis = 10,
+      showMap = false,
+      security = SecurityPolicy.BASIC128,
+      identity = {},
+    } = serverConfig;
+
+    this.serverConfigFormGroup.reset({
       ...serverConfig,
-      timeoutInMillis: timeoutInMillis || 1000,
-      scanPeriodInMillis: scanPeriodInMillis || 1000,
-      enableSubscriptions: enableSubscriptions || true,
-      subCheckPeriodInMillis: subCheckPeriodInMillis || 10,
-      showMap: showMap || false,
-      security: security || SecurityPolicy.BASIC128,
-    };
-    this.serverConfigFormGroup.reset(serverConfigState, {emitEvent: false});
+      timeoutInMillis,
+      scanPeriodInMillis,
+      enableSubscriptions,
+      subCheckPeriodInMillis,
+      showMap,
+      security,
+      identity,
+    }, { emitEvent: false });
   }
 }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-widget.models.ts
index 22915ad9eb..ca683d8c31 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-widget.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-widget.models.ts
@@ -170,6 +170,7 @@ export interface ConnectorSecurity {
   pathToCACert?: string;
   pathToPrivateKey?: string;
   pathToClientCert?: string;
+  mode?: ModeType;
 }
 
 export type ConnectorMapping = DeviceConnectorMapping | RequestMappingData | ConverterConnectorMapping;