Now requires presence of email, not just a format