minor refactor of User validations