Added check for email
2.2.4