Merge branch 'U4-10975' of https://github.com/iofsauron/Umbraco-CMS into iofsauron-U4-10975

src/Umbraco.Web.UI.Client/src/views/users/user.controller.js

@@ -347,8 +347,10 @@
             vm.unlockUserButtonState = "busy";
             usersResource.unlockUsers([vm.user.id]).then(function (data) {
                 vm.user.userState = 0;
+                vm.user.failedPasswordAttempts = 0;
                 setUserDisplayState();
                 vm.unlockUserButtonState = "success";
+                
                 formHelper.showNotifications(data);
             }, function (error) {
                 vm.unlockUserButtonState = "error";