Revert "Revert "Remove email validataion""

This reverts commit 26d57b709f82d056e708f600b7b059f89434ffa1.