Revert "Revert "EmailVerification v2.0""

This reverts commit 17dfbbf3aa1e474c82627c7bb669624326566de4.