Added some email validation.