2 files changed, 17 insertions, 13 deletions

diff --git a/client/src/app/account/account.component.html b/client/src/app/account/account.component.html
index ad8f690bd..4797fa914 100644
--- a/client/src/app/account/account.component.html
+++ b/client/src/app/account/account.component.html
@@ -3,14 +3,14 @@
 <div *ngIf="information" class="alert alert-success">{{ information }}</div>
 <div *ngIf="error" class="alert alert-danger">{{ error }}</div>
 
-<form role="form" (ngSubmit)="changePassword(newPassword.value, newConfirmedPassword.value)" [ngFormModel]="changePasswordForm">
+<form role="form" (ngSubmit)="changePassword()" [formGroup]="changePasswordForm">
   <div class="form-group">
     <label for="new-password">New password</label>
     <input
       type="password" class="form-control" name="new-password" id="new-password"
-      ngControl="newPassword" #newPassword="ngForm"
+      [(ngModel)]="newPassword" #newPasswordInput="ngModel"
     >
-    <div [hidden]="newPassword.valid || newPassword.pristine" class="alert alert-warning">
+    <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>
   </div>
@@ -19,7 +19,7 @@
     <label for="name">Confirm new password</label>
     <input
       type="password" class="form-control" name="new-confirmed-password" id="new-confirmed-password"
-      ngControl="newConfirmedPassword" #newConfirmedPassword="ngForm"
+      [(ngModel)]="newConfirmedPassword" #newConfirmedPasswordInput="ngModel"
     >
   </div>
 
diff --git a/client/src/app/account/account.component.ts b/client/src/app/account/account.component.ts
index 5c42103f8..54939f43b 100644
--- a/client/src/app/account/account.component.ts
+++ b/client/src/app/account/account.component.ts
@@ -1,5 +1,6 @@
-import { Control, ControlGroup, Validators } from '@angular/common';
+import { Validators } from '@angular/common';
 import { Component, OnInit } from '@angular/core';
+import { FormControl, FormGroup, REACTIVE_FORM_DIRECTIVES } from '@angular/forms';
 import { Router } from '@angular/router';
 
 import { AccountService } from './account.service';
@@ -7,11 +8,14 @@ import { AccountService } from './account.service';
 @Component({
   selector: 'my-account',
   template: require('./account.component.html'),
-  providers: [ AccountService ]
+  providers: [ AccountService ],
+  directives: [ REACTIVE_FORM_DIRECTIVES ]
 })
 
 export class AccountComponent implements OnInit {
-  changePasswordForm: ControlGroup;
+  newPassword = '';
+  newConfirmedPassword = '';
+  changePasswordForm: FormGroup;
   information: string = null;
   error: string = null;
 
@@ -21,22 +25,22 @@ export class AccountComponent implements OnInit {
   ) {}
 
   ngOnInit() {
-    this.changePasswordForm = new ControlGroup({
-      newPassword: new Control('', Validators.compose([ Validators.required, Validators.minLength(6) ])),
-      newConfirmedPassword: new Control('', Validators.compose([ Validators.required, Validators.minLength(6) ])),
+    this.changePasswordForm = new FormGroup({
+      'new-password': new FormControl('', [ <any>Validators.required, <any>Validators.minLength(6) ]),
+      'new-confirmed-password': new FormControl('', [ <any>Validators.required, <any>Validators.minLength(6) ]),
     });
   }
 
-  changePassword(newPassword: string, newConfirmedPassword: string) {
+  changePassword() {
     this.information = null;
     this.error = null;
 
-    if (newPassword !== newConfirmedPassword) {
+    if (this.newPassword !== this.newConfirmedPassword) {
       this.error = 'The new password and the confirmed password do not correspond.';
       return;
     }
 
-    this.accountService.changePassword(newPassword).subscribe(
+    this.accountService.changePassword(this.newPassword).subscribe(
       ok => this.information = 'Password updated.',
 
       err => this.error = err