Update User model validations and tests through 6.2
Update User model validations and tests through 6.2