diff --git a/app/controllers/organizations/teams_controller.rb b/app/controllers/organizations/teams_controller.rb
index 939334c71..d3437d23c 100644
--- a/app/controllers/organizations/teams_controller.rb
+++ b/app/controllers/organizations/teams_controller.rb
@@ -9,6 +9,8 @@ class Organizations::TeamsController < Organizations::BaseController
     else
       @teams = @organization.teams.joins(:team_users).where(team_users: {user_id: current_user.id})
     end
+    @is_admin = can_edit_org?
+    @teams = @teams.includes(:team_units, :team_users)
 
     @teams = kaminari_paginate(@teams)
   end
diff --git a/app/views/organizations/teams/_detail.json.jbuilder b/app/views/organizations/teams/_detail.json.jbuilder
index 36011a98f..4f3588cb9 100644
--- a/app/views/organizations/teams/_detail.json.jbuilder
+++ b/app/views/organizations/teams/_detail.json.jbuilder
@@ -7,3 +7,8 @@ json.can_create_org_project team.can_create_org_project
 json.num_projects team.num_projects
 json.num_users team.num_users
 json.units team.team_units.pluck(:unit_type)
+json.users team.team_users.each do |user|
+  json.partial! "organizations/user_detail", user: user&.user
+end
+json.is_admin @is_admin
+json.is_member  team.is_member?(current_user.id)