Add Email Validation and removed border
ref swap for production