Fixes #8790 - Fix N+1 query on user list page