Updates to email verification

Here are my updates. Let me know your thoughts. Once you pull these in, the original pull request should get updated and we can merge into the main project. :shipit: