diff --git a/client/src/app/+admin/overview/users/user-edit/user-edit.component.html b/client/src/app/+admin/overview/users/user-edit/user-edit.component.html
index ecbcfe72f..278bd8c48 100644
--- a/client/src/app/+admin/overview/users/user-edit/user-edit.component.html
+++ b/client/src/app/+admin/overview/users/user-edit/user-edit.component.html
@@ -224,7 +224,7 @@
 
       <div class="form-group">
         <label i18n>Manually set the user password</label>
-        <my-user-password [userId]="user.id"></my-user-password>
+        <my-user-password [userId]="user.id" [username]="user.username"></my-user-password>
       </div>
 
       <div *ngIf="user.twoFactorEnabled" class="form-group">
diff --git a/client/src/app/+admin/overview/users/user-edit/user-password.component.ts b/client/src/app/+admin/overview/users/user-edit/user-password.component.ts
index d6616e077..ec93619f5 100644
--- a/client/src/app/+admin/overview/users/user-edit/user-password.component.ts
+++ b/client/src/app/+admin/overview/users/user-edit/user-password.component.ts
@@ -11,11 +11,11 @@ import { UserUpdate } from '@shared/models'
   styleUrls: [ './user-password.component.scss' ]
 })
 export class UserPasswordComponent extends FormReactive implements OnInit {
-  error: string
-  username: string
-  showPassword = false
-
   @Input() userId: number
+  @Input() username: string
+
+  error: string
+  showPassword = false
 
   constructor (
     protected formReactiveService: FormReactiveService,