Re-add email validation