EHO-314 Validation messages set properly