User ID is shown in users list
Merge branch 'master' into principled