Enrolment options

#2080#
#2080#