Enrolment options

AO-2526
AO-2526