diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/broker-config-control/broker-config-control.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/broker-config-control/broker-config-control.component.html
index 7e25033e84..f70ed366e1 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/broker-config-control/broker-config-control.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/broker-config-control/broker-config-control.component.html
@@ -74,7 +74,7 @@
                 aria-label="Generate"
                 matTooltip="{{ 'gateway.generate-client-id' | translate }}"
                 matTooltipPosition="above"
-                (click)="generate()"
+                (click)="generate('clientId')"
                 *ngIf="!brokerConfigFormGroup.get('clientId').value">
           <mat-icon>autorenew</mat-icon>
         </button>
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 449d2ad1a5..13f5c7c77e 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
@@ -14,7 +14,7 @@
 /// limitations under the License.
 ///
 
-import { AfterViewInit, ChangeDetectionStrategy, Component, forwardRef, OnDestroy } from '@angular/core';
+import { ChangeDetectionStrategy, Component, forwardRef, OnDestroy } from '@angular/core';
 import {
   ControlValueAccessor,
   FormBuilder,
@@ -61,7 +61,7 @@ import { Subject } from 'rxjs';
     }
   ]
 })
-export class BrokerConfigControlComponent implements ControlValueAccessor, Validator, AfterViewInit, OnDestroy {
+export class BrokerConfigControlComponent implements ControlValueAccessor, Validator, OnDestroy {
   brokerConfigFormGroup: UntypedFormGroup;
   mqttVersions = MqttVersions;
   portLimits = PortLimits;
@@ -78,7 +78,7 @@ export class BrokerConfigControlComponent implements ControlValueAccessor, Valid
       host: ['', [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
       port: [null, [Validators.required, Validators.min(PortLimits.MIN), Validators.max(PortLimits.MAX)]],
       version: [5, []],
-      clientId: ['tb_gw_' + generateSecret(5), [Validators.pattern(noLeadTrailSpacesRegex)]],
+      clientId: ['', [Validators.pattern(noLeadTrailSpacesRegex)]],
       security: []
     });
 
@@ -101,17 +101,13 @@ export class BrokerConfigControlComponent implements ControlValueAccessor, Valid
     return '';
   }
 
-  ngAfterViewInit(): void {
-    this.emitDefaultValue();
-  }
-
   ngOnDestroy(): void {
     this.destroy$.next();
     this.destroy$.complete();
   }
 
-  generate(): void {
-    this.brokerConfigFormGroup.get('clientId').patchValue('tb_gw_' + generateSecret(5));
+  generate(formControlName: string): void {
+    this.brokerConfigFormGroup.get(formControlName)?.patchValue('tb_gw_' + generateSecret(5));
   }
 
   registerOnChange(fn: (value: string) => void): void {
@@ -131,8 +127,4 @@ export class BrokerConfigControlComponent implements ControlValueAccessor, Valid
       brokerConfigFormGroup: {valid: false}
     };
   }
-
-  private emitDefaultValue(): void {
-    this.onChange(this.brokerConfigFormGroup.value);
-  };
 }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/mqtt-basic-config/mqtt-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/mqtt-basic-config/mqtt-basic-config.component.ts
index 57436daafd..650ecef68a 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/mqtt-basic-config/mqtt-basic-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/mqtt-basic-config/mqtt-basic-config.component.ts
@@ -114,12 +114,10 @@ export class MqttBasicConfigComponent implements ControlValueAccessor, Validator
 
   writeValue(basicConfig: ConnectorBaseConfig): void {
     const editedBase = {
-      workers: basicConfig.broker
-        ? {
-            maxNumberOfWorkers: basicConfig.broker.maxNumberOfWorkers,
-            maxMessageNumberPerWorker: basicConfig.broker.maxMessageNumberPerWorker,
-          }
-        : {},
+      workers: {
+        maxNumberOfWorkers: basicConfig.broker?.maxNumberOfWorkers,
+        maxMessageNumberPerWorker: basicConfig.broker?.maxMessageNumberPerWorker,
+      },
       dataMapping: basicConfig.dataMapping || [],
       broker: basicConfig.broker || {},
       requestsMapping: Array.isArray(basicConfig.requestsMapping)
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/security-config/security-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/security-config/security-config.component.ts
index a6c147a3e7..38a66daafc 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/security-config/security-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/security-config/security-config.component.ts
@@ -15,7 +15,6 @@
 ///
 
 import {
-  AfterViewInit,
   ChangeDetectionStrategy,
   Component,
   forwardRef,
@@ -68,7 +67,7 @@ import { CommonModule } from '@angular/common';
     SharedModule,
   ]
 })
-export class SecurityConfigComponent implements ControlValueAccessor, OnInit, AfterViewInit, OnDestroy {
+export class SecurityConfigComponent implements ControlValueAccessor, OnInit, OnDestroy {
 
   @Input()
   title = 'gateway.security';
@@ -113,10 +112,6 @@ export class SecurityConfigComponent implements ControlValueAccessor, OnInit, Af
     ).subscribe((type) => this.updateValidators(type));
   }
 
-  ngAfterViewInit(): void {
-    this.emitDefaultValue();
-  }
-
   ngOnDestroy(): void {
     this.destroy$.next();
     this.destroy$.complete();
@@ -148,10 +143,6 @@ export class SecurityConfigComponent implements ControlValueAccessor, OnInit, Af
     this.onTouched = fn;
   }
 
-  private emitDefaultValue(): void {
-    this.onChange(this.securityFormGroup.value);
-  };
-
   private updateValidators(type: SecurityType): void {
     if (type) {
       this.securityFormGroup.get('username').disable({emitEvent: false});
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/server-config/server-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/server-config/server-config.component.ts
index 4f8e563d86..98a36182a6 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/server-config/server-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/server-config/server-config.component.ts
@@ -14,7 +14,7 @@
 /// limitations under the License.
 ///
 
-import { AfterViewInit, ChangeDetectionStrategy, Component, forwardRef, OnDestroy } from '@angular/core';
+import { ChangeDetectionStrategy, Component, forwardRef, OnDestroy } from '@angular/core';
 import {
   ControlValueAccessor,
   FormBuilder,
@@ -61,7 +61,7 @@ import { takeUntil } from 'rxjs/operators';
     SecurityConfigComponent,
   ]
 })
-export class ServerConfigComponent implements ControlValueAccessor, Validator, AfterViewInit, OnDestroy {
+export class ServerConfigComponent implements ControlValueAccessor, Validator, OnDestroy {
 
   securityPolicyTypes = SecurityPolicyTypes;
   serverConfigFormGroup: UntypedFormGroup;
@@ -92,10 +92,6 @@ export class ServerConfigComponent implements ControlValueAccessor, Validator, A
     });
   }
 
-  ngAfterViewInit(): void {
-    this.emitDefaultValue();
-  }
-
   ngOnDestroy(): void {
     this.destroy$.next();
     this.destroy$.complete();
@@ -118,8 +114,4 @@ export class ServerConfigComponent implements ControlValueAccessor, Validator, A
   writeValue(serverConfig: ServerConfig): void {
     this.serverConfigFormGroup.patchValue(serverConfig, {emitEvent: false});
   }
-
-  private emitDefaultValue(): void {
-    this.onChange(this.serverConfigFormGroup.value);
-  };
 }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/workers-config-control/workers-config-control.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/workers-config-control/workers-config-control.component.ts
index be6542963f..9a37bdb07c 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/workers-config-control/workers-config-control.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/workers-config-control/workers-config-control.component.ts
@@ -15,7 +15,6 @@
 ///
 
 import {
-  AfterViewInit,
   ChangeDetectionStrategy,
   Component,
   forwardRef,
@@ -26,9 +25,7 @@ import {
   FormBuilder,
   NG_VALIDATORS,
   NG_VALUE_ACCESSOR,
-  UntypedFormGroup,
-  ValidationErrors,
-  Validator,
+  UntypedFormGroup, ValidationErrors, Validator,
   Validators
 } from '@angular/forms';
 import { SharedModule } from '@shared/shared.module';
@@ -59,7 +56,7 @@ import { takeUntil } from 'rxjs/operators';
     }
   ]
 })
-export class WorkersConfigControlComponent implements AfterViewInit, OnDestroy, ControlValueAccessor, Validator {
+export class WorkersConfigControlComponent implements OnDestroy, ControlValueAccessor, Validator {
 
   workersConfigFormGroup: UntypedFormGroup;
 
@@ -80,10 +77,6 @@ export class WorkersConfigControlComponent implements AfterViewInit, OnDestroy,
     });
   }
 
-  ngAfterViewInit(): void {
-    this.emitDefaultValue();
-  }
-
   ngOnDestroy(): void {
     this.destroy$.next();
     this.destroy$.complete();
@@ -106,8 +99,4 @@ export class WorkersConfigControlComponent implements AfterViewInit, OnDestroy,
       workersConfigFormGroup: {valid: false}
     };
   }
-
-  private emitDefaultValue(): void {
-    this.onChange(this.workersConfigFormGroup.value);
-  };
 }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts
index 5eeffd62cf..14a8c15c00 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts
@@ -551,6 +551,7 @@ export class GatewayConnectorComponent extends PageComponent implements AfterVie
             }
             value.basicConfig = value.configurationJson;
             this.updateConnector(value);
+            this.generate('basicConfig.broker.clientId');
             setTimeout(() => this.saveConnector());
           }
         });
@@ -558,6 +559,10 @@ export class GatewayConnectorComponent extends PageComponent implements AfterVie
     });
   }
 
+  generate(formControlName: string): void {
+    this.connectorForm.get(formControlName)?.patchValue('tb_gw_' + generateSecret(5));
+  }
+
   uniqNameRequired(): ValidatorFn {
     return (c: UntypedFormControl) => {
       const newName = c.value.trim().toLowerCase();