Update to email_field for email fields