Changing Employer from Class Enrolment

We would like to put forward a way for a learners employer to be changed from the Class Enrolment without having to go around the world.

Currently to change the employer shown at the top of the class enrolment we need to change it in the contact update page then come back and change it at the bottom of the class enrolment which then takes a minute or two to refresh itself and actually show at the top of the page.

This would be much easier if we could change this by clicking on an edit button next to the employer name at the top of the page.

Can we also suggest that the Employer contact name also includes the business they are at? e.g. John Smith (ABC Kitchens). This would make it much easier for us to see which company the learner is at if we are in the class enrolment as we take rolling enrolments and deliver workplace based training.