fixed bugs with UserList and lots of else