Add email validation, references GH-6