Fix #2339 (put the more “important” users at the bottom in the userlist when configured)

(one-line fix, and the others are for reformatting imports to be consistent)