fixed email verification and email integrity