Improve email verification