Fixed_email_field #233