Updated user registration/validation flow