Reintroduce user_id into events
Merge pull request #66 from dragonfi/user-id-reintroduce

Reintroduce user_id into events