MDL-30674 enrol_guest: Respect