Changed the way that the email address check works so that only one error message is shown below the field if it is required and left empty.