diff --git a/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts b/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts
index 232785249d..ce0bb03636 100644
--- a/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts
+++ b/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts
@@ -12,7 +12,7 @@ export const DEFAULT_USERS_CREATE_FORM_PROPS = FormProp.createMany<IdentityUserD
     validators: () => [Validators.required, Validators.maxLength(256)],
   },
   {
-    type: ePropType.Password,
+    type: ePropType.PasswordInputGroup,
     name: 'password',
     displayName: 'AbpIdentity::Password',
     id: 'password',
diff --git a/npm/ng-packs/packages/tenant-management/src/lib/defaults/default-tenants-form-props.ts b/npm/ng-packs/packages/tenant-management/src/lib/defaults/default-tenants-form-props.ts
index 4086bdb5ef..a3956e87d5 100644
--- a/npm/ng-packs/packages/tenant-management/src/lib/defaults/default-tenants-form-props.ts
+++ b/npm/ng-packs/packages/tenant-management/src/lib/defaults/default-tenants-form-props.ts
@@ -21,7 +21,7 @@ export const DEFAULT_TENANTS_CREATE_FORM_PROPS = FormProp.createMany<
     validators: () => [Validators.required, Validators.maxLength(256), Validators.email],
   },
   {
-    type: ePropType.Password,
+    type: ePropType.PasswordInputGroup,
     name: 'adminPassword',
     displayName: 'AbpTenantManagement::DisplayName:AdminPassword',
     id: 'admin-password',
diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html
index 2f98d0c871..3c94b3123e 100644
--- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html
+++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html
@@ -145,10 +145,12 @@
         *abpReplaceableTemplate="{
           componentKey: passwordKey,
           inputs: {
-            prop: { value: prop }
+            inputId: { value: prop.id },
+            formControlName: { value: prop.name }
           }
         }"
-        [prop]="prop"
+        [inputId]="prop.id"
+        [formControlName]="prop.name"
       ></abp-password>
     </ng-template>
   </div>
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/password/password.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/password/password.component.ts
index 0c253ba848..64c6f67a92 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/password/password.component.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/password/password.component.ts
@@ -1,13 +1,21 @@
-import {Component, Injector, Input} from '@angular/core';
+import {Component, forwardRef, Injector, Input} from '@angular/core';
 import {AbstractNgModelComponent} from "@abp/ng.core";
+import {NG_VALUE_ACCESSOR} from "@angular/forms";
 
 @Component({
   selector: 'abp-password',
   templateUrl: `password.component.html`,
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => PasswordComponent),
+      multi: true,
+    },
+  ]
 })
-export class PasswordComponent extends AbstractNgModelComponent{
+export class PasswordComponent extends AbstractNgModelComponent {
   @Input() inputId!: string;
-
+  @Input() formControlName!: string;
   fieldTextType: boolean;
 
   constructor(