[1874] Semi-final commit, should work as-is. Still could use a bit of prettifying the userlist.