Revert "Remove email validataion"

This reverts commit 19bd2b56ec2e4dda5aa92a43955456eac350f2a0.