Enrol changes to ease admin