diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/dialog/add-connector-dialog.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/dialog/add-connector-dialog.component.html
index 6e13196b0e..d995136b27 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/dialog/add-connector-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/dialog/add-connector-dialog.component.html
@@ -44,7 +44,7 @@
         <div class="fixed-title-width tb-required" translate>gateway.name</div>
         <div class="tb-flex no-gap">
           <mat-form-field class="tb-flex no-gap" appearance="outline" subscriptSizing="dynamic">
-            <input matInput name="value" formControlName="name" placeholder="{{ 'gateway.set' | translate }}"/>
+            <input matInput autocomplete="off" name="value" formControlName="name" placeholder="{{ 'gateway.set' | translate }}"/>
             <mat-icon matSuffix
                       matTooltipPosition="above"
                       matTooltipClass="tb-error-tooltip"
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.html
index 19353aa139..eb7afe0cc5 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.html
@@ -178,12 +178,14 @@
               <div class="fixed-title-width tb-required" translate>gateway.name</div>
               <div class="tb-flex no-gap">
                 <mat-form-field class="tb-flex no-gap" appearance="outline" subscriptSizing="dynamic">
-                  <input matInput name="value" formControlName="name" placeholder="{{ 'gateway.set' | translate }}"/>
+                  <input matInput autocomplete="off" name="value" formControlName="name" placeholder="{{ 'gateway.set' | translate }}"/>
                   <mat-icon matSuffix
                             matTooltipPosition="above"
                             matTooltipClass="tb-error-tooltip"
-                            [matTooltip]="('gateway.name-required') | translate"
-                            *ngIf="connectorForm.get('name').hasError('required') && connectorForm.get('name').touched"
+                            [matTooltip]="(connectorForm.get('name').hasError('duplicateName') ?
+                                    'gateway.connector-duplicate-name' : 'gateway.name-required') | translate"
+                            *ngIf="(connectorForm.get('name').hasError('required') && connectorForm.get('name').touched) ||
+                                    connectorForm.get('name').hasError('duplicateName')"
                             class="tb-error">
                     warning
                   </mat-icon>