diff --git a/ui-ngx/src/app/shared/components/device/device-gateway-command.component.html b/ui-ngx/src/app/shared/components/device/device-gateway-command.component.html
index e720f4f817..0b3dbc7344 100644
--- a/ui-ngx/src/app/shared/components/device/device-gateway-command.component.html
+++ b/ui-ngx/src/app/shared/components/device/device-gateway-command.component.html
@@ -17,7 +17,7 @@
 -->
 <div mat-dialog-content tb-toast fxLayout="column" toastTarget="dockerCommandDialogContent">
   <span style="padding-bottom: 15px;">In order to run ThingsBoard IoT gateway (<a [href]="helpLink" target="_blank">ThingsBoard IoT gateway</a>) in docker with credentials for this device you can use the following commands.</span>
-  <div fxFlex fxLayout="row" style="justify-content: space-between">
+  <div fxFlex fxLayout="row" style="justify-content: space-between; flex-grow: 0">
     <mat-button-toggle-group [formControl]="selectedOSCControl" aria-label="Favorite Color" style="width: max-content; flex-grow: 0">
       <mat-button-toggle [value]="osTypes.windows"><span translate>gateway.windows </span></mat-button-toggle>
       <mat-button-toggle [value]="osTypes.linux"><span translate>gateway.linux-macos </span></mat-button-toggle>
diff --git a/ui-ngx/src/app/shared/components/device/gateway-configuration.component.ts b/ui-ngx/src/app/shared/components/device/gateway-configuration.component.ts
index 83c2e0a907..5f0e0ae40d 100644
--- a/ui-ngx/src/app/shared/components/device/gateway-configuration.component.ts
+++ b/ui-ngx/src/app/shared/components/device/gateway-configuration.component.ts
@@ -461,7 +461,7 @@ export class GatewayConfigurationComponent implements OnInit {
     const attributes = [];
     attributes.push({
       key: 'RemoteLoggingLevel',
-      value: value.logs.remote.logLevel
+      value: value.logs.remote.enabled ? value.logs.remote.logLevel : GatewayLogLevel.none
     });
     delete value.connectors;
     value.logs = stringToBase64(this.generateLogsFile(value.logs));
diff --git a/ui-ngx/src/app/shared/components/device/gateway-connectors.component.scss b/ui-ngx/src/app/shared/components/device/gateway-connectors.component.scss
index 563a8d8709..0ad7851616 100644
--- a/ui-ngx/src/app/shared/components/device/gateway-connectors.component.scss
+++ b/ui-ngx/src/app/shared/components/device/gateway-connectors.component.scss
@@ -33,10 +33,11 @@
 
   mat-card {
     padding-left: 10px;
+    background: transparent;
   }
 
   .mat-card-selected {
-    background-color: white;
+    background-color: rgba(48, 86, 128, 0.1);
   }
 
   .mat-mdc-slide-toggle {
diff --git a/ui-ngx/src/app/shared/components/device/gateway-connectors.component.ts b/ui-ngx/src/app/shared/components/device/gateway-connectors.component.ts
index 951ed4ae50..2a985a7113 100644
--- a/ui-ngx/src/app/shared/components/device/gateway-connectors.component.ts
+++ b/ui-ngx/src/app/shared/components/device/gateway-connectors.component.ts
@@ -157,6 +157,11 @@ export class GatewayConnectorComponent implements OnInit {
 
   removeConnector(index: number): void {
     this.connectorsFormArray().removeAt(index);
+    if (index !== 0) {
+      this.selectedConnector = index - 1;
+    } else {
+      this.selectedConnector = undefined;
+    }
   }
 
   selectConnector(index: number): void {
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index e25d2667e6..ea9cd2d66c 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -2600,6 +2600,7 @@
         "security-type": "Security type",
         "security-types": {
             "access-token": "Access Token",
+            "username-password": "Username and Password",
             "tls": "TLS",
             "tls-access-token": "TLS + Access Token",
             "tls-private-key": "TLS + Private Key"