Userlist fixes