diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index d287a84..854acf6 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -353,56 +353,56 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             var split = url.split('?em:');
             userInfo.emailId = split[1];
         }
-
         if (userInfo.newPassword != null) {
 
             if (userInfo.newPassword === userInfo.confirmPassword) {
                 $rootScope.passwordMismatchMessage = null;
 
-            AuthenticationService.ResetUserPassword(userInfo)
-            .then(
-                 function (result) {
-                     if (result == LoginConstants.USER_NOT_FOUND) {
-                         //  alert(LoginMessageConstants.USER_OR_PASSWORD_INCORRECT);
-                         $rootScope.errorMessage = LoginMessageConstants.USER_OR_PASSWORD_INCORRECT;
-                         $("#messageModal").modal('show');
-
-                     }
-                     else if (result == LoginConstants.ERROR_IN_FECTHING_DETAILS) {
-                         // alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS);
-                         $rootScope.errorMessage = LoginConstants.ERROR_IN_FECTHING_DETAILS;
-                         $("#messageModal").modal('show');
+                AuthenticationService.ResetUserPassword(userInfo)
+                .then(
+                     function (result) {
+                         if (result == LoginConstants.USER_NOT_FOUND) {
+                             //  alert(LoginMessageConstants.USER_OR_PASSWORD_INCORRECT);
+                             $rootScope.errorMessage = LoginMessageConstants.USER_OR_PASSWORD_INCORRECT;
+                             $("#messageModal").modal('show');
 
-                     }
-                     else {
-                         //if ((result.IsAcknowledged == true) && (result.IsModifiedCountAvailable == true)) {
-                         if (result == LoginMessageConstants.PASSWORD_UPDATE_SUCCESS) {
-                             // alert(LoginMessageConstants.PASSWORD_RESET_MESSAGE);
-                             $rootScope.errorMessage = LoginMessageConstants.PASSWORD_RESET_MESSAGE;
+                         }
+                         else if (result == LoginConstants.ERROR_IN_FECTHING_DETAILS) {
+                             // alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS);
+                             $rootScope.errorMessage = LoginConstants.ERROR_IN_FECTHING_DETAILS;
                              $("#messageModal").modal('show');
-                             $rootScope.isVisibleLogin = true;
-                             $rootScope.isVisibleResetPass = false;
-                             $location.url("/");
+
                          }
-                     }
-                 },
-                 function (error) {
-                     console.log(' Error in authentication = ' + error.statusText);
-                     //  alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS);
-                     $rootScope.errorMessage = LoginMessageConstants.ERROR_IN_FECTHING_DETAILS;
-                     $("#messageModal").modal('show');
+                         else {
+                             //if ((result.IsAcknowledged == true) && (result.IsModifiedCountAvailable == true)) {
+                             if (result == LoginMessageConstants.PASSWORD_UPDATE_SUCCESS) {
+                                 // alert(LoginMessageConstants.PASSWORD_RESET_MESSAGE);
+                                 $rootScope.errorMessage = LoginMessageConstants.PASSWORD_RESET_MESSAGE;
+                                 $("#messageModal").modal('show');
+                                 $rootScope.isVisibleLogin = true;
+                                 $rootScope.isVisibleResetPass = false;
+                                 $location.url("/");
+                             }
+                         }
+                     },
+                     function (error) {
+                         console.log(' Error in authentication = ' + error.statusText);
+                         //  alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS);
+                         $rootScope.errorMessage = LoginMessageConstants.ERROR_IN_FECTHING_DETAILS;
+                         $("#messageModal").modal('show');
 
-                 });
-        }
-        else {
-            $rootScope.passwordMismatchMassage = LoginMessageConstants.NEW_AND_OLD_PASSWORD_DONOT_MATCH;
-                //$("#messageModal").modal('show');
+                     });
+            }
+            else {
+                $rootScope.errorMessage = LoginMessageConstants.NEW_AND_OLD_PASSWORD_DONOT_MATCH;
+                $("#messageModal").modal('show');
             }
         }
         else {
             $rootScope.errorMessage = LoginMessageConstants.NEW_PASSWORD_FIELD_IS_EMPTY;
             $("#messageModal").modal('show');
         }
+        
     }
 
     $rootScope.lexiconLanguageArray = [];
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html
index 6f6a657..fc06809 100644
--- a/400-SOURCECODE/AIAHTML5.Web/index.html
+++ b/400-SOURCECODE/AIAHTML5.Web/index.html
@@ -1115,9 +1115,10 @@
                                     </tr>
                                     <tr>
                                         <td>
-                                            <input class="form-control" name="newPassword" value="*****" type="password" style="padding:3px 5px; height:25px; width:98%;" ng-model="userInfo.newPassword" ng-minlength="5" required>
+                                            <input class="form-control" name="newPassword" value="*****" type="password" style="padding:3px 5px; height:25px; width:98%;" ng-model="userInfo.newPassword" ng-minlength="8" ng-maxlength="20" required>
                                             <span style="color: maroon; font-weight:bold" ng-show="resetPasswordForm.newPassword.$touched && resetPasswordForm.newPassword.$invalid && resetPasswordForm.newPassword.$pristine">The password is required.</span>
-                                            <p ng-show="resetPasswordForm.newPassword.$error.minlength" style="font-weight: bold; color: maroon;">Password is too short.</p>
+                                            <p ng-show="resetPasswordForm.newPassword.$error.minlength" style="font-weight: bold; color: maroon;">Password length must be between 8 - 20 characters.</p>
+                                            <p ng-show="resetPasswordForm.newPassword.$error.maxlength" style="font-weight: bold; color: maroon;">Password length must be between 8 - 20 characters.</p>
                                         </td>
                                     </tr>
                                     <tr>
@@ -1131,7 +1132,7 @@
                                         <td>
                                             <input class="form-control" name="confirmPassword" value="*****" type="password" style="padding:3px 5px; height:25px; width:98%;" ng-model="userInfo.confirmPassword" required>
                                             <span style="color: maroon; font-weight: bold; " ng-show="resetPasswordForm.confirmPassword.$touched && resetPasswordForm.confirmPassword.$invalid">Confirm password is required.</span>
-                                            <span style="color: maroon; font-weight: bold; " ng-if="passwordMismatchMessage">{{passwordMismatchMessage}}</span>
+                                            <span style="color: maroon; font-weight: bold; " ng-if="resetPasswordForm.newPassword !== resetPasswordForm.confirmPassword">{{passwordMismatchMessage}}</span>
                                         </td>
                                     </tr>
                                     <tr>
@@ -1139,7 +1140,7 @@
                                     </tr>
                                     <tr>
                                         <td>
-                                            <button type="submit" ng-click="ResetUserPassword(userInfo)" ng-submit="submitForm(resetPwdForm.$valid)" style="background: #0072a7; border: 1px solid #005076; cursor: pointer; color: #fff; padding: 5px 10px; font-size: 16px; text-transform: uppercase; text-align: center; text-decoration: none; font-family: gotham, 'Helvetica Neue', helvetica, arial, sans-serif; " id="btnUpdatePassword">Submit</button>
+                                            <button type="submit" ng-disabled="resetPasswordForm.$invalid" ng-submit="submitForm(resetPasswordForm.$valid)" ng-click="ResetUserPassword(userInfo)" style="background: #0072a7; border: 1px solid #005076; cursor: pointer; color: #fff; padding: 5px 10px; font-size: 16px; text-transform: uppercase; text-align: center; text-decoration: none; font-family: gotham, 'Helvetica Neue', helvetica, arial, sans-serif; " id="btnUpdatePassword">Submit</button> <!--ng-submit="submitForm(resetPwdForm.$valid)"-->  <!--ng-click="ResetUserPassword(userInfo)"-->
                                         </td>
                                     </tr>
                                 </tbody>