diff --git a/src/app/page/my-account/my-account-settings-page/password-settings/password-settings.component.html b/src/app/page/my-account/my-account-settings-page/password-settings/password-settings.component.html
index fe799859..b7651466 100644
--- a/src/app/page/my-account/my-account-settings-page/password-settings/password-settings.component.html
+++ b/src/app/page/my-account/my-account-settings-page/password-settings/password-settings.component.html
@@ -40,8 +40,10 @@ <h4 class="text-primary text-lg font-bold">Password</h4>
   </div>
 
   <!-- Edit Mode -->
-  <div *ngIf="editMode()">
+  <div *ngIf="editMode() && userData()">
     <form (ngSubmit)="savePassword(newPassword)" class="space-y-4">
+      <input type="email" [hidden]="true" name="username" id="username" required placeholder="Username"
+             [ngModel]="userData()!.username" autocomplete="username" #username="ngModel">
 
       <!-- New Password Input -->
       <div class="relative">