Add single usage enrolment keys
CEP - Fix pages