Fix email validation

@fiallega , Here is the fix for the email validation issue.