Shaw) Email Validation

Upgrade to the new version