diff --git a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
index af1381e000..8550af2e70 100644
--- a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
+++ b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
@@ -137,9 +137,9 @@
                 <input type="text" id="surname" class="form-control" formControlName="surname" />
               </div>
 
-              <div *ngIf="!selected.userName" class="form-group">
+              <div class="form-group">
                 <label for="password">{{ 'AbpIdentity::Password' | abpLocalization }}</label
-                ><span> * </span>
+                ><span *ngIf="!selected.userName"> * </span>
                 <input
                   type="password"
                   id="password"
diff --git a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts
index 230365cb68..d010abf3dd 100644
--- a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts
+++ b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts
@@ -94,6 +94,8 @@ export class UsersComponent implements OnInit {
 
       if (!this.selected.userName) {
         this.form.addControl('password', new FormControl('', [Validators.required, Validators.maxLength(32)]));
+      } else {
+        this.form.addControl('password', new FormControl('', [Validators.maxLength(32)]));
       }
     });
   }