peng modified email_validation and user_register