Fixed user list issues