diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
index b113fdf93e..feb28eda13 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
@@ -105,7 +105,12 @@ function ChangePasswordDashboardController($scope, xmlhelper, $log, userResource
     $scope.changePassword = function() {
 
         if (formHelper.submitForm({ scope: $scope })) {
-            userResource.changePassword($scope.changePasswordModel.value).then(function() {
+            userResource.changePassword($scope.changePasswordModel.value).then(function(data) {
+
+                //if the password has been reset, then update our model
+                if (data.value) {
+                    $scope.changePasswordModel.value.generatedPassword = data.value;
+                }
 
                 formHelper.resetForm({ scope: $scope, notifications: data.notifications });
                 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.controller.js
index f56a37058f..01101e73e9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.controller.js
@@ -76,9 +76,15 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.ChangePasswordCont
         //listen for the saved event, when that occurs we'll 
         //change to changing = false;
         $scope.$on("formSubmitted", function () {
-            $scope.changing = false;
+            if ($scope.model.config.disableToggle === false) {
+                $scope.changing = false;
+            }
             resetModel();
         });
+        $scope.$on("formSubmitting", function() {
+            //if there was a previously generated password displaying, clear it
+            $scope.model.value.generatedPassword = null;
+        });
 
         $scope.showReset = function() {
             return $scope.model.config.hasPassword && $scope.model.config.enableReset;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.html
index 525e1c2ee3..b86f066546 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.html
@@ -1,53 +1,53 @@
-<div ng-controller="Umbraco.PropertyEditors.ChangePasswordController" ng-switch="changing">
-    <div ng-switch-when="false">
-                
-        <div class="alert alert-success text-center" ng-hide="!model.value.generatedPassword">
-            <small>Password has been reset to:</small>
-            <br/>
-            <strong>{{model.value.generatedPassword}}</strong>
-        </div>
-
-        <a href="" ng-click="doChange()" class="btn btn-small">Change password</a>         
+<div ng-controller="Umbraco.PropertyEditors.ChangePasswordController">
+    <div class="alert alert-success text-center" ng-hide="!model.value.generatedPassword">
+        <small>Password has been reset to:</small>
+        <br/>
+        <strong>{{model.value.generatedPassword}}</strong>
     </div>
-    <div ng-switch-when="true">
+    <div ng-switch="changing">
+        <div ng-switch-when="false">        
+            <a href="" ng-click="doChange()" class="btn btn-small">Change password</a>         
+        </div>
+        <div ng-switch-when="true">
         
-        <umb-control-group alias="resetPassword" label="Reset password?" ng-show="$parent.showReset()">
-	        <input type="checkbox" ng-model="$parent.model.value.reset" 
-			        id="Checkbox1" 
-			        name="resetPassword"
-			        val-server="resetPassword"/>     
-	        <span class="help-inline" val-msg-for="resetPassword" val-toggle-msg="valServer"></span>            
-        </umb-control-group>
+            <umb-control-group alias="resetPassword" label="Reset password?" ng-show="$parent.showReset()">
+                <input type="checkbox" ng-model="$parent.model.value.reset" 
+                       id="Checkbox1" 
+                       name="resetPassword"
+                       val-server="resetPassword"/>     
+                <span class="help-inline" val-msg-for="resetPassword" val-toggle-msg="valServer"></span>            
+            </umb-control-group>
 
-        <!-- we need to show the old pass field when the provider cannot retreive the password -->
-        <umb-control-group alias="oldPassword" label="Old password" ng-show="$parent.showOldPass()">            
-	        <input type="text" name="oldPassword" ng-model="$parent.model.value.oldPassword"
-			           class="input-large umb-textstring textstring" 
-			           ng-required="$parent.oldPassRequired()"
-			           val-server="oldPassword" />    
-	        <span class="help-inline" val-msg-for="oldPassword" val-toggle-msg="required">Required</span>
-	        <span class="help-inline" val-msg-for="oldPassword" val-toggle-msg="valServer"></span>
-        </umb-control-group>
+            <!-- we need to show the old pass field when the provider cannot retreive the password -->
+            <umb-control-group alias="oldPassword" label="Old password" ng-show="$parent.showOldPass()">            
+                <input type="text" name="oldPassword" ng-model="$parent.model.value.oldPassword"
+                       class="input-large umb-textstring textstring" 
+                       ng-required="$parent.oldPassRequired()"
+                       val-server="oldPassword" />    
+                <span class="help-inline" val-msg-for="oldPassword" val-toggle-msg="required">Required</span>
+                <span class="help-inline" val-msg-for="oldPassword" val-toggle-msg="valServer"></span>
+            </umb-control-group>
 
-        <umb-control-group alias="password" label="New password" ng-show="$parent.showNewPass()">            
-	        <input type="text" name="password" ng-model="$parent.model.value.newPassword"
-			           class="input-large umb-textstring textstring" 
-			           ng-required="!$parent.model.value.reset"
-			           val-server="value" 
-			           ng-minlength="{{$parent.model.config.minPasswordLength}}" />    
-	        <span class="help-inline" val-msg-for="password" val-toggle-msg="required">Required</span>    
-	        <span class="help-inline" val-msg-for="password" val-toggle-msg="minlength">Minimum {{$parent.model.config.minPasswordLength}} characters</span>    
-	        <span class="help-inline" val-msg-for="password" val-toggle-msg="valServer"></span>     
-        </umb-control-group>
+            <umb-control-group alias="password" label="New password" ng-show="$parent.showNewPass()">            
+                <input type="text" name="password" ng-model="$parent.model.value.newPassword"
+                       class="input-large umb-textstring textstring" 
+                       ng-required="!$parent.model.value.reset"
+                       val-server="value" 
+                       ng-minlength="{{$parent.model.config.minPasswordLength}}" />    
+                <span class="help-inline" val-msg-for="password" val-toggle-msg="required">Required</span>    
+                <span class="help-inline" val-msg-for="password" val-toggle-msg="minlength">Minimum {{$parent.model.config.minPasswordLength}} characters</span>    
+                <span class="help-inline" val-msg-for="password" val-toggle-msg="valServer"></span>     
+            </umb-control-group>
 
-        <umb-control-group alias="confirmpassword" label="Confirm password" ng-show="$parent.showConfirmPass()">
-	        <input type="text" name="confirmpassword" ng-model="$parent.model.confirm"
-			        class="input-large umb-textstring textstring"
-			        val-compare="password" />
+            <umb-control-group alias="confirmpassword" label="Confirm password" ng-show="$parent.showConfirmPass()">
+                <input type="text" name="confirmpassword" ng-model="$parent.model.confirm"
+                       class="input-large umb-textstring textstring"
+                       val-compare="password" />
 
-	        <span class="help-inline" val-msg-for="confirmpassword" val-toggle-msg="valCompare">Passwords must match</span>     
-        </umb-control-group> 
+                <span class="help-inline" val-msg-for="confirmpassword" val-toggle-msg="valCompare">Passwords must match</span>     
+            </umb-control-group> 
 
-        <a href="" ng-click="cancelChange()" ng-show="showCancelBtn()" class="btn btn-small">Cancel</a> 
-    </div>        
+            <a href="" ng-click="cancelChange()" ng-show="showCancelBtn()" class="btn btn-small">Cancel</a> 
+        </div>      
+    </div>  
 </div>
\ No newline at end of file
diff --git a/src/Umbraco.Web/Editors/UserController.cs b/src/Umbraco.Web/Editors/UserController.cs
index 5014c53eb3..ca8974d852 100644
--- a/src/Umbraco.Web/Editors/UserController.cs
+++ b/src/Umbraco.Web/Editors/UserController.cs
@@ -8,10 +8,13 @@ using System.Web.Http;
 using System.Web.Security;
 using AutoMapper;
 using Umbraco.Core.Configuration;
+using Umbraco.Web.Models;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Models.Mapping;
 using Umbraco.Web.Mvc;
+using Umbraco.Web.UI;
 using Umbraco.Web.WebApi;
+using umbraco;
 using legacyUser = umbraco.BusinessLogic.User;
 using System.Net.Http;
 using System.Collections.Specialized;
@@ -62,9 +65,9 @@ namespace Umbraco.Web.Editors
         /// </summary>
         /// <param name="data"></param>
         /// <returns>
-        /// If the password is being reset it will return the newly reset password, otherwise will return null;
+        /// If the password is being reset it will return the newly reset password, otherwise will return an empty value
         /// </returns>
-        public string PostChangePassword(ChangingPasswordModel data)
+        public ModelWithNotifications<string> PostChangePassword(ChangingPasswordModel data)
         {
             var userProvider = Membership.Providers[UmbracoConfig.For.UmbracoSettings().Providers.DefaultBackOfficeUserProvider];
             if (userProvider == null)
@@ -82,10 +85,13 @@ namespace Umbraco.Web.Editors
             if (passwordChangeResult.Success)
             {
                 //even if we weren't resetting this, it is the correct value (null), otherwise if we were resetting then it will contain the new pword
-                return passwordChangeResult.Result.ResetPassword;
+                var result = new ModelWithNotifications<string>(passwordChangeResult.Result.ResetPassword);
+                result.AddSuccessNotification(ui.Text("user", "password"), ui.Text("user", "passwordChanged"));
+                return result;
             }
 
-            //it wasn't successful, so add the change error to the model state
+            //it wasn't successful, so add the change error to the model state, we've name the property alias _umb_password on the form
+            // so that is why it is being used here.
             ModelState.AddPropertyError(
                 passwordChangeResult.Result.ChangeError,
                 string.Format("{0}password", Constants.PropertyEditors.InternalGenericPropertiesPrefix));
diff --git a/src/Umbraco.Web/Models/ContentEditing/ChangingPasswordModel.cs b/src/Umbraco.Web/Models/ChangingPasswordModel.cs
similarity index 97%
rename from src/Umbraco.Web/Models/ContentEditing/ChangingPasswordModel.cs
rename to src/Umbraco.Web/Models/ChangingPasswordModel.cs
index 362894ca42..935d9d3ccf 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ChangingPasswordModel.cs
+++ b/src/Umbraco.Web/Models/ChangingPasswordModel.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Runtime.Serialization;
 
-namespace Umbraco.Web.Models.ContentEditing
+namespace Umbraco.Web.Models
 {
     /// <summary>
     /// A model representing an attempt at changing a password
diff --git a/src/Umbraco.Web/Models/ContentEditing/INotificationModel.cs b/src/Umbraco.Web/Models/ContentEditing/INotificationModel.cs
index 9480a528ae..401ced3c91 100644
--- a/src/Umbraco.Web/Models/ContentEditing/INotificationModel.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/INotificationModel.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Runtime.Serialization;
 
 namespace Umbraco.Web.Models.ContentEditing
 {
@@ -7,6 +8,7 @@ namespace Umbraco.Web.Models.ContentEditing
         /// <summary>
         /// This is used to add custom localized messages/strings to the response for the app to use for localized UI purposes.
         /// </summary>
+        [DataMember(Name = "notifications")]
         List<Notification> Notifications { get; }
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/Models/ContentEditing/ModelWithNotifications.cs b/src/Umbraco.Web/Models/ContentEditing/ModelWithNotifications.cs
new file mode 100644
index 0000000000..4d45304e44
--- /dev/null
+++ b/src/Umbraco.Web/Models/ContentEditing/ModelWithNotifications.cs
@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace Umbraco.Web.Models.ContentEditing
+{
+    /// <summary>
+    /// A generic model supporting notifications, this is useful for returning any model type to include notifications from api controllers
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    [DataContract(Name = "model", Namespace = "")]
+    public class ModelWithNotifications<T> : INotificationModel
+    {
+        public ModelWithNotifications(T value)
+        {
+            Value = value;
+            Notifications = new List<Notification>();
+        }
+
+        /// <summary>
+        /// The generic value
+        /// </summary>
+        [DataMember(Name = "value")]
+        public T Value { get; private set; }
+
+        /// <summary>
+        /// The notifications
+        /// </summary>
+        [DataMember(Name = "notifications")]
+        public List<Notification> Notifications { get; private set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Security/WebSecurity.cs b/src/Umbraco.Web/Security/WebSecurity.cs
index 5b236da7f1..6192f8471a 100644
--- a/src/Umbraco.Web/Security/WebSecurity.cs
+++ b/src/Umbraco.Web/Security/WebSecurity.cs
@@ -11,6 +11,7 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Security;
+using Umbraco.Web.Models;
 using Umbraco.Web.Models.ContentEditing;
 using umbraco;
 using umbraco.DataLayer;
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 9c9a79fac1..e81d9f047a 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -313,7 +313,8 @@
     <Compile Include="Editors\MemberTypeController.cs" />
     <Compile Include="Editors\TagExtractor.cs" />
     <Compile Include="MembershipProviderExtensions.cs" />
-    <Compile Include="Models\ContentEditing\ChangingPasswordModel.cs" />
+    <Compile Include="Models\ChangingPasswordModel.cs" />
+    <Compile Include="Models\ContentEditing\ModelWithNotifications.cs" />
     <Compile Include="Models\ContentEditing\StyleSheet.cs" />
     <Compile Include="Editors\StylesheetController.cs" />
     <Compile Include="Models\ContentEditing\AuditLog.cs" />