Fix email verification logic