Fix for events with no user