diff --git a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
index 1569b5979b..e32d331d0a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
@@ -93,8 +93,14 @@
                   //in the ASP.NET Identity world, this config option will allow an admin user to change another user's password
                   //if the user has access to the user section. So if this editor is being access, the user of course has access to this section.
                   //the authorization check is also done on the server side when submitted.
-                  vm.changePasswordModel.config.allowManuallyChangingPassword = !vm.user.isCurrentUser;
-                  
+                    
+                  // only update the setting if not the current logged in user, otherwise leave the value as it is
+                  // currently set in the web.config
+                  if (!vm.user.isCurrentUser)
+                  {
+                      vm.changePasswordModel.config.allowManuallyChangingPassword = true;
+                  }
+                    
                   vm.loading = false;
                 });
             });