diff --git a/src/Umbraco.Core/Security/MembershipProviderBase.cs b/src/Umbraco.Core/Security/MembershipProviderBase.cs
index 3c7a1664f8..85af50a922 100644
--- a/src/Umbraco.Core/Security/MembershipProviderBase.cs
+++ b/src/Umbraco.Core/Security/MembershipProviderBase.cs
@@ -3,6 +3,7 @@ using System.Collections.Specialized;
 using System.Configuration.Provider;
 using System.Security.Cryptography;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Web.Configuration;
 using System.Web.Hosting;
 using System.Web.Security;
@@ -213,6 +214,58 @@ namespace Umbraco.Core.Security
 
         }
 
+        /// <summary>
+        /// Override this method to ensure the password is valid before raising the event
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnValidatingPassword(ValidatePasswordEventArgs e)
+        {
+            var attempt = IsPasswordValid(e.Password, MinRequiredNonAlphanumericCharacters, PasswordStrengthRegularExpression, MinRequiredPasswordLength);
+            if (attempt.Success == false)
+            {
+                e.Cancel = true;
+                return;
+            }
+
+            base.OnValidatingPassword(e);
+        }
+
+        protected internal enum PasswordValidityError
+        {
+            Ok,
+            Length,
+            AlphanumericChars,
+            Strength
+        }
+
+        protected internal Attempt<PasswordValidityError> IsPasswordValid(string password, int minRequiredNonAlphanumericChars, string strengthRegex, int minLength)
+        {
+            if (minRequiredNonAlphanumericChars > 0)
+            {
+                var nonAlphaNumeric = Regex.Replace(password, "[a-zA-Z0-9]", "", RegexOptions.Multiline | RegexOptions.IgnoreCase);
+                if (nonAlphaNumeric.Length < minRequiredNonAlphanumericChars)
+                {
+                    return Attempt.Fail(PasswordValidityError.AlphanumericChars);
+                }
+            }
+
+            if (string.IsNullOrEmpty(strengthRegex) == false)
+            {
+                if (Regex.IsMatch(password, strengthRegex, RegexOptions.Compiled) == false)
+                {
+                    return Attempt.Fail(PasswordValidityError.Strength);
+                }
+                
+            }
+
+            if (password.Length < minLength)
+            {
+                return Attempt.Fail(PasswordValidityError.Length);
+            }
+
+            return Attempt.Succeed(PasswordValidityError.Ok);
+        }
+
         /// <summary>
         /// Gets the name of the default app.
         /// </summary>
diff --git a/src/Umbraco.Web.UI/umbraco/controls/PasswordChanger.ascx.cs b/src/Umbraco.Web.UI/umbraco/controls/PasswordChanger.ascx.cs
index 7e6b19c470..a42e5b3ca1 100644
--- a/src/Umbraco.Web.UI/umbraco/controls/PasswordChanger.ascx.cs
+++ b/src/Umbraco.Web.UI/umbraco/controls/PasswordChanger.ascx.cs
@@ -13,6 +13,12 @@ namespace Umbraco.Web.UI.Umbraco.Controls
         {
             base.OnPreRender(e);
 
+            //always reset the control vals
+            ResetPasswordCheckBox.Checked = false;
+            umbPasswordChanger_passwordCurrent.Text = null;
+            umbPasswordChanger_passwordNew.Text = null;
+            umbPasswordChanger_passwordNewConfirm.Text = null;
+            
             this.DataBind();
         } 
 
diff --git a/src/Umbraco.Web.UI/umbraco/controls/PasswordChanger.ascx.designer.cs b/src/Umbraco.Web.UI/umbraco/controls/PasswordChanger.ascx.designer.cs
index b56d057c6c..b5368261ac 100644
--- a/src/Umbraco.Web.UI/umbraco/controls/PasswordChanger.ascx.designer.cs
+++ b/src/Umbraco.Web.UI/umbraco/controls/PasswordChanger.ascx.designer.cs
@@ -12,8 +12,6 @@ namespace Umbraco.Web.UI.Umbraco.Controls {
     
     public partial class PasswordChanger {
         
-        
-        
         /// <summary>
         /// ResetPlaceHolder control.
         /// </summary>
diff --git a/src/Umbraco.Web.UI/umbraco/controls/passwordChanger.ascx b/src/Umbraco.Web.UI/umbraco/controls/passwordChanger.ascx
index dd00fddb61..065333995e 100644
--- a/src/Umbraco.Web.UI/umbraco/controls/passwordChanger.ascx
+++ b/src/Umbraco.Web.UI/umbraco/controls/passwordChanger.ascx
@@ -10,7 +10,7 @@
                     this.togglePasswordInputValidators(true);
                     $(e).closest(".propertyItem").replaceWith($("#umbPasswordChanger"));
                     $("#umbPasswordChanger").show();
-                    $("#<%=IsChangingPasswordField.ClientID%>").val(true);
+                    $("#<%=IsChangingPasswordField.ClientID%>").val("true");
                     $(e).hide();
                 }                
             },
@@ -20,11 +20,17 @@
                     ValidatorEnable(document.getElementById('<%=ConfirmPasswordValidator.ClientID %>'), true);
                     ValidatorEnable(document.getElementById('<%=NewPasswordLengthValidator.ClientID %>'), true);
                     if (!enablePassRetrieval) {
-                        ValidatorEnable(document.getElementById('<%=CurrentPasswordValidator.ClientID %>'), true);
+                        var currPassVal = document.getElementById('<%=CurrentPasswordValidator.ClientID %>');
+                        if (currPassVal) {
+                            ValidatorEnable(currPassVal, true);   
+                        }                        
                     }
                 }
                 else {
-                    ValidatorEnable(document.getElementById('<%=CurrentPasswordValidator.ClientID %>'), false);
+                    var currPassVal = document.getElementById('<%=CurrentPasswordValidator.ClientID %>');
+                    if (currPassVal) {
+                        ValidatorEnable(currPassVal, false);   
+                    }                        
                     ValidatorEnable(document.getElementById('<%=ConfirmPasswordValidator.ClientID %>'), false);
                     ValidatorEnable(document.getElementById('<%=NewPasswordRequiredValidator.ClientID %>'), false);
                     ValidatorEnable(document.getElementById('<%=NewPasswordLengthValidator.ClientID %>'), false);                    
@@ -57,9 +63,9 @@
 
 <a href="#" id="changePasswordButton">Change password</a><br />
 
-<asp:HiddenField runat="server" ID="IsChangingPasswordField" Value="false" />
-
 <div class="propertyItem" id="umbPasswordChanger" style="display: none;">
+    
+    <asp:HiddenField runat="server" ID="IsChangingPasswordField" Value="false" />
 
     <asp:PlaceHolder runat="server" ID="ResetPlaceHolder" Visible="<%#Provider.EnablePasswordReset %>">
         <div class="propertyItemheader"><%=umbraco.ui.GetText("user", "resetPassword")%></div>
@@ -69,7 +75,7 @@
     </asp:PlaceHolder>
 
     <div id="passwordInputArea">
-        <asp:PlaceHolder runat="server" ID="CurrentPasswordPlaceHolder" Visible="<%#Provider.EnablePasswordReset == false %>">
+        <asp:PlaceHolder runat="server" ID="CurrentPasswordPlaceHolder" Visible="<%#Provider.EnablePasswordRetrieval == false %>">
             <div class="propertyItemheader"><%=umbraco.ui.GetText("user", "passwordCurrent")%></div>
             <div class="propertyItemContent">
                 <asp:TextBox ID="umbPasswordChanger_passwordCurrent" autocomplete="off" AutoCompleteType="None" TextMode="password" runat="server"></asp:TextBox>
@@ -107,3 +113,10 @@
     </div>
 
 </div>
+
+<div id="Div1" runat="server" class="success" style="margin-top:10px;width:300px;" Visible="<%# string.IsNullOrWhiteSpace(ChangingPasswordModel.GeneratedPassword) == false %>">
+    <p style="text-align: center">
+        Password has been reset to<br/><br/> 
+        <strong><%# ChangingPasswordModel.GeneratedPassword %></strong>
+    </p>
+</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index b3f33f8a62..49c6071a18 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1880,7 +1880,9 @@
       <SubType>ASPXCodeBehind</SubType>
     </Content>
     <Content Include="umbraco.presentation\umbraco\dialogs\cruds.aspx" />
-    <Content Include="umbraco.presentation\umbraco\dialogs\emptyTrashcan.aspx" />
+    <Content Include="umbraco.presentation\umbraco\dialogs\emptyTrashcan.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
     <Content Include="umbraco.presentation\umbraco\dialogs\exportDocumenttype.aspx" />
     <Content Include="umbraco.presentation\umbraco\dialogs\imageViewer.aspx" />
     <Content Include="umbraco.presentation\umbraco\dialogs\importDocumenttype.aspx" />
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/passwordChanger.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/passwordChanger.ascx.cs
index e9dbbbb271..1a87a1ef20 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/passwordChanger.ascx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/passwordChanger.ascx.cs
@@ -32,17 +32,16 @@ namespace umbraco.controls
             }
         }
 
+        private readonly ChangingPasswordModel _model = new ChangingPasswordModel();
+
         public ChangingPasswordModel ChangingPasswordModel
         {
             get
             {
-                var model = new ChangingPasswordModel
-                    {
-                        NewPassword = umbPasswordChanger_passwordNew.Text,
-                        OldPassword = umbPasswordChanger_passwordCurrent.Text,
-                        Reset = ResetPasswordCheckBox.Checked
-                    };
-                return model;
+                _model.NewPassword = umbPasswordChanger_passwordNew.Text;
+                _model.OldPassword = umbPasswordChanger_passwordCurrent.Text;
+                _model.Reset = ResetPasswordCheckBox.Checked;           
+                return _model;
             }
         }
 
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
index 4b439dd91d..e4f5361881 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Configuration.Provider;
 using System.Globalization;
 using System.IO;
 using System.Web;
@@ -65,6 +66,18 @@ namespace umbraco.cms.presentation.user
 
         private User u;
 
+        private MembershipProvider BackOfficeProvider
+        {
+            get
+            {
+                var provider = Membership.Providers[UmbracoSettings.DefaultBackofficeProvider];
+                if (provider == null)
+                {
+                    throw new ProviderException("The membership provider " + UmbracoSettings.DefaultBackofficeProvider + " was not found");
+                }
+                return provider;
+            }
+        }
 
         protected void Page_Load(object sender, EventArgs e)
         {
@@ -148,7 +161,25 @@ namespace umbraco.cms.presentation.user
             // Add password changer
             var passwordChanger = (passwordChanger) LoadControl(SystemDirectories.Umbraco + "/controls/passwordChanger.ascx");
             passwordChanger.MembershipProviderName = UmbracoSettings.DefaultBackofficeProvider;
+            
+            //Add a custom validation message for the password changer
+            var passwordValidation = new CustomValidator
+                {
+                    ID = "PasswordChangerValidator"
+                };
+            var validatorContainer = new HtmlGenericControl("div")
+                {
+                    Visible = false,
+                    EnableViewState = false
+                };
+            validatorContainer.Attributes["class"] = "error";
+            validatorContainer.Style.Add(HtmlTextWriterStyle.MarginTop, "10px");
+            validatorContainer.Style.Add(HtmlTextWriterStyle.Width, "300px");
+            var validatorContainer2 = new HtmlGenericControl("p");
+            validatorContainer.Controls.Add(validatorContainer2);
+            validatorContainer2.Controls.Add(passwordValidation);
             passw.Controls.Add(passwordChanger);
+            passw.Controls.Add(validatorContainer);
 
             pp.addProperty(ui.Text("user", "username", UmbracoUser), uname);
             pp.addProperty(ui.Text("user", "loginname", UmbracoUser), lname);
@@ -319,7 +350,7 @@ namespace umbraco.cms.presentation.user
 
             if (!IsPostBack)
             {
-                MembershipUser user = Membership.Providers[UmbracoSettings.DefaultBackofficeProvider].GetUser(u.LoginName, true);
+                MembershipUser user = BackOfficeProvider.GetUser(u.LoginName, true);
                 uname.Text = u.Name;
                 lname.Text = (user == null) ? u.LoginName : user.UserName;
                 email.Text = (user == null) ? u.Email : user.Email;
@@ -386,33 +417,51 @@ namespace umbraco.cms.presentation.user
             {
                 try
                 {
-                    var membershipUser = Membership.Providers[UmbracoSettings.DefaultBackofficeProvider].GetUser(u.LoginName, true);
-
-
-                    //TODO: We need to overhaul this editor like I have in v7 so that it dynamically creates the form based
-                    // on the membership provider and provides the correct validation feedback in the UI if things are not supported.
-                    //We need to also have this functionality put onto the change password dashboard.
-
-                    var passwordChangerControl = (passwordChanger) passw.Controls[0];
-                    
-                    UmbracoContext.Current.Security.ChangePassword()
-
-                    if (string.IsNullOrEmpty(tempPassword) == false)
+                    var membershipUser = BackOfficeProvider.GetUser(u.LoginName, true);
+                    if (membershipUser == null)
                     {
-                        // make sure password is not empty
-                        if (string.IsNullOrEmpty(u.Password)) u.Password = "default";
-                        membershipUser.ChangePassword(u.Password, tempPassword);
+                        throw new ProviderException("Could not find user in the membership provider with login name " + u.LoginName);
                     }
 
+                    var passwordChangerControl = (passwordChanger) passw.Controls[0];
+                    var passwordChangerValidator = (CustomValidator) passw.Controls[1].Controls[0].Controls[0];
+
+                    if (passwordChangerControl.IsChangingPassword)
+                    {
+                        //SD: not sure why this check is here but must have been for some reason at some point?
+                        if (string.IsNullOrEmpty(passwordChangerControl.ChangingPasswordModel.NewPassword) == false)
+                        {
+                            // make sure password is not empty
+                            if (string.IsNullOrEmpty(u.Password)) u.Password = "default";                            
+                        }
+
+                        var changePassResult = UmbracoContext.Current.Security.ChangePassword(
+                            membershipUser.UserName, passwordChangerControl.ChangingPasswordModel, BackOfficeProvider);    
+
+                        if (changePassResult.Success)
+                        {
+                            //if it is successful, we need to show the generated password if there was one, so set
+                            //that back on the control
+                            passwordChangerControl.ChangingPasswordModel.GeneratedPassword = changePassResult.Result.ResetPassword;
+                        }
+                        else
+                        {
+                            passwordChangerValidator.IsValid = false;
+                            passwordChangerValidator.ErrorMessage = changePassResult.Result.ChangeError.ErrorMessage;
+                            passw.Controls[1].Visible = true;
+                        }
+
+                    }
+                    
                     // Is it using the default membership provider
-                    if (Membership.Providers[UmbracoSettings.DefaultBackofficeProvider] is UsersMembershipProvider)
+                    if (BackOfficeProvider is UsersMembershipProvider)
                     {
                         // Save user in membership provider
                         UsersMembershipUser umbracoUser = membershipUser as UsersMembershipUser;
                         umbracoUser.FullName = uname.Text.Trim();
                         umbracoUser.Language = userLanguage.SelectedValue;
                         umbracoUser.UserType = UserType.GetUserType(int.Parse(userType.SelectedValue));
-                        Membership.Providers[UmbracoSettings.DefaultBackofficeProvider].UpdateUser(umbracoUser);
+                        BackOfficeProvider.UpdateUser(umbracoUser);
 
                         // Save user details
                         u.Email = email.Text.Trim();
@@ -425,9 +474,9 @@ namespace umbraco.cms.presentation.user
                         u.UserType = UserType.GetUserType(int.Parse(userType.SelectedValue));
                         //SD: This check must be here for some reason but apparently we don't want to try to 
                         // update when the AD provider is active.
-                        if ((Membership.Providers[UmbracoSettings.DefaultBackofficeProvider] is ActiveDirectoryMembershipProvider) == false)
+                        if ((BackOfficeProvider is ActiveDirectoryMembershipProvider) == false)
                         {
-                            Membership.Providers[UmbracoSettings.DefaultBackofficeProvider].UpdateUser(membershipUser);
+                            BackOfficeProvider.UpdateUser(membershipUser);
                         }
                     }
 
diff --git a/src/umbraco.providers/UsersMembershipProvider.cs b/src/umbraco.providers/UsersMembershipProvider.cs
index 03b4fb530a..3467137666 100644
--- a/src/umbraco.providers/UsersMembershipProvider.cs
+++ b/src/umbraco.providers/UsersMembershipProvider.cs
@@ -53,7 +53,7 @@ namespace umbraco.providers
                 {
                     if (args.FailureInformation != null)
                         throw args.FailureInformation;
-                    throw new MembershipPasswordException("Change password canceled due to new password validation failure.");
+                    throw new MembershipPasswordException("Change password canceled due to password validation failure.");
                 }
 
                 var user = new User(username);
diff --git a/src/umbraco.providers/members/MembersMembershipProvider.cs b/src/umbraco.providers/members/MembersMembershipProvider.cs
index 5339c3b800..2f249587b9 100644
--- a/src/umbraco.providers/members/MembersMembershipProvider.cs
+++ b/src/umbraco.providers/members/MembersMembershipProvider.cs
@@ -134,7 +134,7 @@ namespace umbraco.providers.members
             {
                 if (args.FailureInformation != null)
                     throw args.FailureInformation;
-                throw new MembershipPasswordException("Change password canceled due to new password validation failure.");
+                throw new MembershipPasswordException("Change password canceled due to password validation failure.");
             }
 
             string salt;
@@ -145,8 +145,6 @@ namespace umbraco.providers.members
             return true;
         }
 
-
-
         /// <summary>
         /// Processes a request to update the password question and answer for a membership user.
         /// </summary>