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 6691a025e4..7f4f5bf014 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/passwordChanger.ascx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/passwordChanger.ascx.cs
@@ -38,9 +38,12 @@ namespace umbraco.controls
                     var umbProvider = Provider as MembershipProviderBase;
                     if (umbProvider != null && umbProvider.AllowManuallyChangingPassword)
                     {
-                        return false;
+                        _showOldPassword = false;
+                    }
+                    else
+                    {
+                        _showOldPassword = Provider.EnablePasswordRetrieval == false;
                     }
-                    _showOldPassword = Provider.EnablePasswordRetrieval == false;    
                 }
                 return _showOldPassword.Value;
             }