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 13f5c7c77e..83ece09cde 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
@@ -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: ['', [Validators.pattern(noLeadTrailSpacesRegex)]],
+      clientId: ['tb_gw_' + generateSecret(5), [Validators.pattern(noLeadTrailSpacesRegex)]],
       security: []
     });
 
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 650ecef68a..1b37ff5bf7 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
@@ -113,16 +113,18 @@ export class MqttBasicConfigComponent implements ControlValueAccessor, Validator
   }
 
   writeValue(basicConfig: ConnectorBaseConfig): void {
+    const { broker, dataMapping = [], requestsMapping } = basicConfig;
+
     const editedBase = {
-      workers: {
-        maxNumberOfWorkers: basicConfig.broker?.maxNumberOfWorkers,
-        maxMessageNumberPerWorker: basicConfig.broker?.maxMessageNumberPerWorker,
-      },
-      dataMapping: basicConfig.dataMapping || [],
-      broker: basicConfig.broker || {},
-      requestsMapping: Array.isArray(basicConfig.requestsMapping)
-        ? basicConfig.requestsMapping
-        : this.getRequestDataArray(basicConfig.requestsMapping),
+      workers: broker && (broker.maxNumberOfWorkers || broker.maxMessageNumberPerWorker) ? {
+        maxNumberOfWorkers: broker.maxNumberOfWorkers,
+        maxMessageNumberPerWorker: broker.maxMessageNumberPerWorker,
+      } : {},
+      dataMapping: dataMapping || [],
+      broker: broker || {},
+      requestsMapping: Array.isArray(requestsMapping)
+        ? requestsMapping
+        : this.getRequestDataArray(requestsMapping),
     };
 
     this.basicFormGroup.setValue(editedBase, {emitEvent: false});
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 c05b7c32b6..ba7acc1593 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
@@ -25,7 +25,9 @@ import {
   FormBuilder,
   NG_VALIDATORS,
   NG_VALUE_ACCESSOR,
-  UntypedFormGroup, ValidationErrors, Validator,
+  UntypedFormGroup,
+  ValidationErrors,
+  Validator,
   Validators
 } from '@angular/forms';
 import { SharedModule } from '@shared/shared.module';
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/dialog/add-connector-dialog.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/dialog/add-connector-dialog.component.ts
index 7cdfbf5808..5a1b5d2a1b 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/dialog/add-connector-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/dialog/add-connector-dialog.component.ts
@@ -33,7 +33,7 @@ import {
 } from '@home/components/widget/lib/gateway/gateway-widget.models';
 import { Subject } from 'rxjs';
 import { ResourcesService } from '@core/services/resources.service';
-import { takeUntil, tap } from "rxjs/operators";
+import { takeUntil, tap } from 'rxjs/operators';
 
 @Component({
   selector: 'tb-add-connector-dialog',