diff --git a/routers/web/org/home.go b/routers/web/org/home.go
index 7d06763e7e..3ea7c72c65 100644
--- a/routers/web/org/home.go
+++ b/routers/web/org/home.go
@@ -93,7 +93,7 @@ func home(ctx *context.Context, viewRepositories bool) {
 		ListOptions:  db.ListOptions{Page: 1, PageSize: 25},
 	}
 
-	members, _, err := organization.FindOrgMembers(ctx, opts)
+	members, membersIsPublic, err := organization.FindOrgMembers(ctx, opts)
 	if err != nil {
 		ctx.ServerError("FindOrgMembers", err)
 		return
@@ -102,6 +102,14 @@ func home(ctx *context.Context, viewRepositories bool) {
 	const orgOverviewTeamsLimit = 5
 	ctx.Data["OrgOverviewMembers"] = members
 	ctx.Data["OrgOverviewTeams"] = ctx.Org.Teams[:min(len(ctx.Org.Teams), orgOverviewTeamsLimit)]
+	ctx.Data["Members"] = members
+	ctx.Data["NumMembers"] = len(members)
+	ctx.Data["Teams"] = ctx.Org.Teams
+	ctx.Data["IsOrganizationMember"] = ctx.Org.IsMember
+	ctx.Data["IsOrganizationOwner"] = ctx.Org.IsOwner
+	ctx.Data["IsPublicMember"] = func(uid int64) bool {
+		return membersIsPublic[uid]
+	}
 	ctx.Data["DisableNewPullMirrors"] = setting.Mirror.DisableNewPull
 	ctx.Data["ShowMemberAndTeamTab"] = ctx.Org.IsMember || len(members) > 0