diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/password/password.component.html b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/password/password.component.html
index 195b46c96d..685e6eca66 100644
--- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/password/password.component.html
+++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/password/password.component.html
@@ -1,24 +1,19 @@
-<div class="input-group">
-  <div class="row w-100">
-    <div class="col-11 pe-0">
-      <input
-        [type]="fieldTextType ? 'text' : 'password'"
-        class="form-control"
-        [id]="prop.id"
-        [formControlName]="prop.name"
-      />
-    </div>
-    <div class="col-1 ps-0">
-      <button class="btn btn-secondary" type="button">
-        <i
-          class="fa"
-          [ngClass]="{
-            'fa-eye-slash': !fieldTextType,
-            'fa-eye': fieldTextType
-          }"
-          (click)="toggleFieldTextType()"
-        ></i>
-      </button>
-    </div>
-  </div>
+<div class="input-group" validationTarget>
+  <input
+    [type]="fieldTextType ? 'text' : 'password'"
+    class="form-control"
+    [id]="prop.id"
+    [formControlName]="prop.name"
+  />
+
+  <button class="btn btn-secondary" type="button">
+    <i
+      class="fa"
+      [ngClass]="{
+        'fa-eye-slash': !fieldTextType,
+        'fa-eye': fieldTextType
+      }"
+      (click)="toggleFieldTextType()"
+    ></i>
+  </button>
 </div>