diff --git a/src/generators/app/index.js b/src/generators/app/index.js
index ce9793c6a..d318c88a7 100644
--- a/src/generators/app/index.js
+++ b/src/generators/app/index.js
@@ -522,6 +522,7 @@ export class Generator extends Base {
             return contents
               .replace(/confirmpassword/g, 'confirmPassword')
               .replace(/loginform/g, 'loginForm')
+              .replace(/changepasswordform/g, 'changePasswordForm')
               .replace(/newpassword/g, 'newPassword')
               .replace(/ngif/g, 'ngIf')
               .replace(/ngfor/g, 'ngFor')
diff --git a/templates/app/client/app/account(auth)/settings/settings.html b/templates/app/client/app/account(auth)/settings/settings.html
index 6a33253a6..c8e36ba35 100644
--- a/templates/app/client/app/account(auth)/settings/settings.html
+++ b/templates/app/client/app/account(auth)/settings/settings.html
@@ -4,7 +4,7 @@
       <h1>Change Password</h1>
     </div>
     <div class="col-sm-12">
-      <form class="form" name="form" (ngSubmit)="changePassword()" novalidate>
+      <form class="form" name="changePasswordForm" (ngSubmit)="changePassword(changePasswordForm)" novalidate #changePasswordForm="ngForm">
 
         <div class="form-group">
           <label>Current Password</label>