Fixed user list issue