Jhelbert/enrollment mode change events

2?