[TIMOB-14186] moved the enroll event to ensure it get sent

Needs 3.1.1 back port