Fix UserEventsService