More work on bug #8365.  It now gets the users in a better way.