1 files changed, 8 insertions, 8 deletions

diff --git a/client/src/app/account/account.component.html b/client/src/app/account/account.component.html
index 4797fa914..5a8847acd 100644
--- a/client/src/app/account/account.component.html
+++ b/client/src/app/account/account.component.html
@@ -3,25 +3,25 @@
 <div *ngIf="information" class="alert alert-success">{{ information }}</div>
 <div *ngIf="error" class="alert alert-danger">{{ error }}</div>
 
-<form role="form" (ngSubmit)="changePassword()" [formGroup]="changePasswordForm">
+<form role="form" (ngSubmit)="changePassword()" [formGroup]="form">
   <div class="form-group">
     <label for="new-password">New password</label>
     <input
-      type="password" class="form-control" name="new-password" id="new-password"
-      [(ngModel)]="newPassword" #newPasswordInput="ngModel"
+      type="password" class="form-control" id="new-password"
+      formControlName="new-password"
     >
-    <div [hidden]="changePasswordForm.controls['new-password'].valid || changePasswordForm.controls['new-password'].pristine" class="alert alert-warning">
-      The password should have more than 5 characters
+    <div *ngIf="formErrors['new-password']" class="alert alert-danger">
+      {{ formErrors['new-password'] }}
     </div>
   </div>
 
   <div class="form-group">
     <label for="name">Confirm new password</label>
     <input
-      type="password" class="form-control" name="new-confirmed-password" id="new-confirmed-password"
-      [(ngModel)]="newConfirmedPassword" #newConfirmedPasswordInput="ngModel"
+      type="password" class="form-control" id="new-confirmed-password"
+      formControlName="new-confirmed-password"
     >
   </div>
 
-  <input type="submit" value="Change password" class="btn btn-default" [disabled]="!changePasswordForm.valid">
+  <input type="submit" value="Change password" class="btn btn-default" [disabled]="!form.valid">
 </form>