Fixup global user listing

Fixup 7a5cb5a7c41447b8fa4b3961fc02e242eb6e6f52