Added support for regular email verification