Email Verification fix.