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 0b3dbc7344..b963a18aaf 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
@@ -16,7 +16,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>
+  <span style="padding-bottom: 15px;">In order to run ThingsBoard IoT gateway in docker with credentials for this device you can use the following commands.</span>
   <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>
diff --git a/ui-ngx/src/app/shared/components/device/gateway-configuration.component.scss b/ui-ngx/src/app/shared/components/device/gateway-configuration.component.scss
index d8d121a722..7d3f357589 100644
--- a/ui-ngx/src/app/shared/components/device/gateway-configuration.component.scss
+++ b/ui-ngx/src/app/shared/components/device/gateway-configuration.component.scss
@@ -193,10 +193,9 @@
   .line-break {
     width: 100%;
   }
-  //
-  //::ng-deep.mat-mdc-slide-toggle .mdc-switch {
-  //  position: relative;
-  //  transform: translateY(4px);
-  //}
+
+  textarea {
+    resize: none;
+  }
 }
 
diff --git a/ui-ngx/src/app/shared/components/device/gateway-service-rpc.component.ts b/ui-ngx/src/app/shared/components/device/gateway-service-rpc.component.ts
index 1dc88c8e0f..c5891019cc 100644
--- a/ui-ngx/src/app/shared/components/device/gateway-service-rpc.component.ts
+++ b/ui-ngx/src/app/shared/components/device/gateway-service-rpc.component.ts
@@ -94,7 +94,7 @@ export class GatewayServiceRPCComponent extends PageComponent implements AfterVi
 
   sendCommand() {
     const formValues = this.commandForm.value;
-    this.ctx.controlApi.sendTwoWayCommand(formValues.command.toLowerCase(), {},formValues.time).subscribe(resp=>{
+    this.ctx.controlApi.sendTwoWayCommand('gateway_'+formValues.command.toLowerCase(), {},formValues.time).subscribe(resp=>{
       console.log(resp);
       this.commandForm.get('result').setValue(resp);
     },error => {