#4494 simplify and sort user list