MDL-33448 enrol_manual: Reordered things to improve JS performance when enrolling...