Enrolment options

ENG-272
ENG-272