#884 updates to EmailVerificationField