System events page
Merge pull request #552 from sexnothing/user

System events page
Merge remote-tracking branch 'upstream/user' into user