Jhelbert/enrollment mode change events

This shouldn't be necessary... presumably somewhere around here we are changing the mode... which is where the event should be emitted from.