userlist_fixes
Merge pull request #155 from reidbaker/userlist_bugs

userlist_fixes