diff --git a/Content/css/dockyard.css b/Content/css/dockyard.css
index c664661f11..e1b5af2a20 100644
--- a/Content/css/dockyard.css
+++ b/Content/css/dockyard.css
@@ -21,6 +21,17 @@
     cursor: pointer;
 }
 
+
+.before-submit.ng-touched.ng-invalid-required {
+    border-color: #ebccd1;
+}
+.before-submit.ng-dirty.ng-invalid {
+  border-color: #ebccd1;
+}
+.before-submit.ng-untouched.ng-invalid {
+    border-color: #ccc; 
+}
+
 .form-horizontal .control-label {
     text-align: left;
 }
diff --git a/Scripts/app/controllers/ManageUserController.ts b/Scripts/app/controllers/ManageUserController.ts
index b3433ad83f..85e27a327b 100644
--- a/Scripts/app/controllers/ManageUserController.ts
+++ b/Scripts/app/controllers/ManageUserController.ts
@@ -6,7 +6,7 @@
         NewPassword: string;
         ConfirmNewPassword: string;
         Submit: (isValid: boolean) => void;
-        Message: string;
+        Message: any;
     }
 
     class ManageUserController {
@@ -27,9 +27,10 @@
             $scope.NewPassword = "";
             $scope.ConfirmNewPassword = "";
             $scope.CurrentPassword = "";
+            $scope.Message = new Object();
         }
 
-        private Submit(isValid) {
+        private Submit(isValid, sub) {
             if (isValid) {
                 this.UserService.update({
                     oldPassword: this.$scope.CurrentPassword,
@@ -37,13 +38,16 @@
                     confirmPassword: this.$scope.ConfirmNewPassword
                 }).$promise.then(
                     (result) => {
-                        this.$scope.Message = "Your password has been changed!";
+                        this.$scope.Message.text = "Your password has been changed!";
+                        this.$scope.Message.type = "info";
                     },
                     (failResponse) => {
-                        this.$scope.Message = failResponse.data.details.exception.Message;
+                        this.$scope.Message.text = failResponse.data.details.exception.Message;
+                        this.$scope.Message.type = "error";
                     });
             } else {
-                this.$scope.Message = "There are still invalid fields below";
+                this.$scope.Message.text = "There are still invalid fields below";
+                this.$scope.Message.type = "error";
             }
         };
     }
diff --git a/Views/AngularTemplate/ChangePassword.cshtml b/Views/AngularTemplate/ChangePassword.cshtml
index 258e46748a..8bbb96205f 100644
--- a/Views/AngularTemplate/ChangePassword.cshtml
+++ b/Views/AngularTemplate/ChangePassword.cshtml
@@ -13,33 +13,43 @@
                     <!-- TERMINAL DETAIL FORM -->
                     <div class="tab-pane active" id="tab_1_1">
                         <form name="registrationForm" novalidate ng-submit="Submit(registrationForm.$valid)">
-                            <div class="alert alert-info" ng-show="Message != null">
-                                <b>{{Message}}</b>
+           
+                            <div class="alert" ng-class="{'alert-danger':Message.type=='error','alert-info':Message.type=='info'}" ng-show="Message.text != null">
+                                {{Message.text}}
                             </div>
 
-                            <div class="form-group">
+                            <div ng-class="(registrationForm.CurrentPassword.$invalid && registrationForm.$submitted) ? 'has-error' : ''" class="form-group">
                                 <label class="control-label col-md-4" for="OldPassword">Current password</label>
                                 <div class="col-sm-10 col-md-7">
-                                    <input class="form-control" ng-model="CurrentPassword" required id="CurrentPassword" name="CurrentPassword" type="password" />
-                                    <div ng-messages="registrationForm.CurrentPassword.$error">
+                                    <div class="input-icon right">
+                                        <i class="fa fa-warning" ng-show="registrationForm.CurrentPassword.$invalid && registrationForm.$submitted"></i>
+                                        <input class="form-control before-submit" ng-model="CurrentPassword" required  id="CurrentPassword" name="CurrentPassword" type="password" />
+                                    </div>
+                                    <div ng-messages="registrationForm.CurrentPassword.$error" ng-if="registrationForm.CurrentPassword.$dirty">
                                         <div ng-messages-include="Messages.html"></div>
                                     </div>
                                 </div>
                             </div>
-                            <div class="form-group">
+                            <div  ng-class="(registrationForm.NewPassword.$invalid && registrationForm.$submitted) ? 'has-error' : ''" class="form-group">
                                 <label class="control-label col-md-4" for="NewPassword">New password</label>
                                 <div class="col-sm-10 col-md-7">
-                                    <input class="form-control" ng-model="NewPassword" ng-minlength="6" ng-maxlength="30" required id="NewPassword" name="NewPassword" type="password" />
-                                    <div ng-messages="registrationForm.NewPassword.$error">
+                                    <div class="input-icon right">
+                                        <i class="fa fa-warning" ng-show="registrationForm.NewPassword.$invalid && registrationForm.$submitted"></i>
+                                        <input class="form-control before-submit" ng-model="NewPassword" ng-minlength="6" ng-maxlength="30" required id="NewPassword" name="NewPassword" type="password" />
+                                    </div>
+                                    <div ng-if="registrationForm.NewPassword.$dirty" ng-messages="registrationForm.NewPassword.$error">
                                         <div ng-messages-include="Messages.html"></div>
                                     </div>
                                 </div>
                             </div>
-                            <div class="form-group">
+                            <div  ng-class="(registrationForm.ConfirmNewPassword.$invalid && registrationForm.$submitted) ? 'has-error' : ''" class="form-group">
                                 <label class="control-label col-md-4" for="ConfirmPassword">Confirm new password</label>
                                 <div class="col-sm-10 col-md-7">
-                                    <input class="form-control" ng-model="ConfirmNewPassword" compare-to="NewPassword" id="ConfirmNewPassword" name="ConfirmNewPassword" type="password" />
-                                    <div ng-messages="registrationForm.ConfirmNewPassword.$error">
+                                    <div class="input-icon right">
+                                        <i class="fa fa-warning" ng-show="registrationForm.ConfirmNewPassword.$invalid && registrationForm.$submitted"></i>
+                                        <input class="form-control before-submit" ng-model="ConfirmNewPassword" required compare-to="NewPassword" id="ConfirmNewPassword" name="ConfirmNewPassword" type="password" />
+                                    </div>
+                                    <div  ng-if="registrationForm.ConfirmNewPassword.$dirty" ng-messages="registrationForm.ConfirmNewPassword.$error">
                                         <div ng-messages-include="Messages.html"></div>
                                     </div>
                                 </div>