User list bug handler
Merge pull request #467 from sexnothing/user

User list bug handler