Fix to allow event-driven UserMapping