diff --git a/src/app/user-management/setup-user/setup-user.component.html b/src/app/user-management/setup-user/setup-user.component.html
index ed18c5b..af8f642 100644
--- a/src/app/user-management/setup-user/setup-user.component.html
+++ b/src/app/user-management/setup-user/setup-user.component.html
@@ -187,66 +187,43 @@
                               </div>
 
                               <!-- Password -->
-                              <div class="col-md-6">
-                                <div class="d-flex align-items-center gap-2">
-                                  <label
-                                    for="defaultPassword"
-                                    class="text-nowrap"
-                                  >
-                                    {{ "password" | translate
-                                    }}<span class="mandatory" *ngIf="mode === 'create'">*</span>
-                                    <span class="text-muted small" *ngIf="mode === 'edit'"></span>
-                                  </label>
-                                  <div
-                                    class="password-wrapper position-relative w-100"
-                                  >
-                                  <div class="password-wrapper">
-                                     <input
-                                      id="defaultPassword"
-                                      [type]="passwordType"
-                                      class="form-control"
-                                      formControlName="defaultPassword"
-                                      name="defaultPassword"
-                                      placeholder="{{
-                                        mode === 'create' ? ('passwordPlaceHolder' | translate) : ('newPasswordOptional' | translate)
-                                      }}"
-                                      appNoWhitespaces
-                                    />
-                                    <app-password-hide-show #passShowSetupUser class="password-eye align-items" [showPassword]="true"
-                                        (onEyeClick)="toggleSetupPass()"></app-password-hide-show>
+<!-- Password field (only show in create mode) -->
+<div class="col-md-6" *ngIf="mode === 'create'">
+  <div class="d-flex align-items-center gap-2">
+    <label for="defaultPassword" class="text-nowrap">
+      {{ "password" | translate }}<span class="mandatory">*</span>
+    </label>
+    <div class="password-wrapper position-relative w-100">
+      <input
+        id="defaultPassword"
+        [type]="passwordType"
+        class="form-control"
+        formControlName="defaultPassword"
+        name="defaultPassword"
+        placeholder="{{ 'passwordPlaceHolder' | translate }}"
+        appNoWhitespaces
+      />
+      <app-password-hide-show
+        #passShowSetupUser
+        class="password-eye align-items"
+        [showPassword]="true"
+        (onEyeClick)="toggleSetupPass()"
+      ></app-password-hide-show>
+      <div
+        class="text-danger"
+        *ngIf="userForm.get('defaultPassword')?.touched && userForm.get('defaultPassword')?.invalid"
+      >
+        <div *ngIf="userForm.get('defaultPassword')?.errors?.['required']">
+          {{ "fieldRequired" | translate }}
+        </div>
+        <div *ngIf="userForm.get('defaultPassword')?.errors?.['pattern']">
+          {{ "passwordPattern" | translate }}
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
 
-                                  </div>                                 
-                                    <div
-                                      class="text-danger"
-                                      *ngIf="
-                                        userForm.get('defaultPassword')
-                                          ?.touched &&
-                                        userForm.get('defaultPassword')?.invalid
-                                      "
-                                    >
-                                      <div
-                                        *ngIf="
-                                          userForm.get('defaultPassword')
-                                            ?.errors?.['required'] &&
-                                          mode === 'create'
-                                        "
-                                      >
-                                        {{ "fieldRequired" | translate }}
-                                      </div>
-                                      <div
-                                        *ngIf="
-                                          !userForm.get('defaultPassword')
-                                            ?.errors?.['required'] &&
-                                          userForm.get('defaultPassword')
-                                            ?.errors?.['pattern']
-                                        "
-                                      >
-                                        {{ "passwordPattern" | translate }}
-                                      </div>
-                                    </div>
-                                  </div>
-                                </div>
-                              </div>
                             </div>
 
                             <div class="row g-3 mb-3">