Improve default UserValidator behavior