Email validation.
Email validation.
Revert "Email validation."

This reverts commit 829576a27fae0455be2e8da7b8bdd06286ef24ef.
Merge origin/master
Email validation.