Fix issue where user could not change password two times in a row