Added check for email