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