Fixed user list handling