diff --git a/products/desktop/packages/ui/src/features/mcp-gateway/components/parts/GatewayAddServer.test.tsx b/products/desktop/packages/ui/src/features/mcp-gateway/components/parts/GatewayAddServer.test.tsx
index 5222dd0315cf..09be2d4ee1ee 100644
--- a/products/desktop/packages/ui/src/features/mcp-gateway/components/parts/GatewayAddServer.test.tsx
+++ b/products/desktop/packages/ui/src/features/mcp-gateway/components/parts/GatewayAddServer.test.tsx
@@ -41,7 +41,9 @@ describe("GatewayAddServer", () => {
       </Theme>,
     );
 
-    expect(screen.getByText("Available to team members")).toBeInTheDocument();
+    expect(
+      screen.getByText("Enabled for your organization"),
+    ).toBeInTheDocument();
     expect(screen.getByText("Share with agents")).toBeInTheDocument();
     expect(screen.getByText(account.name)).toBeInTheDocument();
     expect(screen.queryByText("One shared credential")).not.toBeInTheDocument();
diff --git a/products/desktop/packages/ui/src/features/mcp-gateway/components/parts/GatewayAddServer.tsx b/products/desktop/packages/ui/src/features/mcp-gateway/components/parts/GatewayAddServer.tsx
index f5bc6ef62aa5..37465d285eb2 100644
--- a/products/desktop/packages/ui/src/features/mcp-gateway/components/parts/GatewayAddServer.tsx
+++ b/products/desktop/packages/ui/src/features/mcp-gateway/components/parts/GatewayAddServer.tsx
@@ -241,11 +241,11 @@ export function GatewayAddServer({
             <Flex direction="column" gap="3">
               {isAdmin && (
                 <ToggleRow
-                  title="Available to team members"
-                  sub={
+                  title="Enabled for your organization"
+                  description={
                     values.teamEnabled
-                      ? "Members can find this server and connect their own account"
-                      : "Only admins will see it until you enable it in Team settings."
+                      ? "Anyone in your organization can find and use this server. Each person connects with their own account."
+                      : "This server is turned off for everyone in your organization."
                   }
                   checked={values.teamEnabled}
                   onChange={(checked) => set("teamEnabled", checked)}
@@ -365,12 +365,12 @@ function Field({
 
 function ToggleRow({
   title,
-  sub,
+  description,
   checked,
   onChange,
 }: {
   title: string;
-  sub: string;
+  description?: string;
   checked: boolean;
   onChange: (checked: boolean) => void;
 }) {
@@ -385,9 +385,11 @@ function ToggleRow({
         <Text as="div" className="font-medium text-sm">
           {title}
         </Text>
-        <Text as="div" color="gray" className="text-[13px]">
-          {sub}
-        </Text>
+        {description && (
+          <Text as="div" color="gray" className="text-[13px]">
+            {description}
+          </Text>
+        )}
       </div>
       <Switch checked={checked} onCheckedChange={onChange} />
     </Flex>
diff --git a/products/desktop/packages/ui/src/features/mcp-gateway/components/parts/GatewayServerDetail.tsx b/products/desktop/packages/ui/src/features/mcp-gateway/components/parts/GatewayServerDetail.tsx
index be518d9e03ec..cbbb930c6f43 100644
--- a/products/desktop/packages/ui/src/features/mcp-gateway/components/parts/GatewayServerDetail.tsx
+++ b/products/desktop/packages/ui/src/features/mcp-gateway/components/parts/GatewayServerDetail.tsx
@@ -854,12 +854,12 @@ function AccessSection({
           >
             <div>
               <Text as="div" className="font-medium text-sm">
-                Available to team members
+                Enabled for your organization
               </Text>
               <Text as="div" color="gray" className="text-[13px]">
                 {server.is_team_enabled
-                  ? `Members can connect their own ${server.name} account.`
-                  : `Turned off — members can't see or call ${server.name}.`}
+                  ? `Anyone in your organization can find and use ${server.name}. Each person connects with their own account.`
+                  : `${server.name} is turned off for everyone in your organization.`}
               </Text>
             </div>
             <Switch
diff --git a/products/mcp_store/frontend/gateway/GatewayAddServerModal.tsx b/products/mcp_store/frontend/gateway/GatewayAddServerModal.tsx
index 5504bd43acde..a6b8374becc6 100644
--- a/products/mcp_store/frontend/gateway/GatewayAddServerModal.tsx
+++ b/products/mcp_store/frontend/gateway/GatewayAddServerModal.tsx
@@ -203,9 +203,10 @@ export function GatewayAddServerModal(): JSX.Element | null {
                 {isAdmin && (
                     <div className="flex items-center justify-between gap-4 rounded border p-3">
                         <div>
-                            <div className="font-semibold">Available to team members</div>
+                            <div className="font-semibold">Enabled for your organization</div>
                             <div className="text-sm text-secondary">
-                                Members can find this server and connect their own account.
+                                Anyone in your organization can find and use this server. Each person connects with
+                                their own account.
                             </div>
                         </div>
                         <LemonSwitch
diff --git a/products/mcp_store/frontend/gateway/GatewayServerAccess.tsx b/products/mcp_store/frontend/gateway/GatewayServerAccess.tsx
index ee37c045008f..74f1da07f310 100644
--- a/products/mcp_store/frontend/gateway/GatewayServerAccess.tsx
+++ b/products/mcp_store/frontend/gateway/GatewayServerAccess.tsx
@@ -54,17 +54,17 @@ export function GatewayAccessSection(): JSX.Element | null {
                 <>
                     <div className="border rounded p-3 flex items-center justify-between gap-3 bg-surface-secondary">
                         <div>
-                            <div className="font-semibold">Available to team members</div>
+                            <div className="font-semibold">Enabled for your organization</div>
                             <div className="text-sm text-secondary">
                                 {server.is_team_enabled
-                                    ? `Members can connect their own ${server.name} account.`
-                                    : `Members cannot see or call ${server.name} while it is off.`}
+                                    ? `Anyone in your organization can find and use ${server.name}. Each person connects with their own account.`
+                                    : `${server.name} is turned off for everyone in your organization.`}
                             </div>
                         </div>
                         <LemonSwitch
                             checked={server.is_team_enabled}
                             loading={allServersEnabledLoading || serverEnabledLoadingIds.has(server.id)}
-                            aria-label={`${server.is_team_enabled ? 'Turn off' : 'Turn on'} ${server.name} for the team`}
+                            aria-label={`${server.is_team_enabled ? 'Turn off' : 'Turn on'} ${server.name} for your organization`}
                             onChange={(checked) => toggleServerEnabled(server.id, checked)}
                         />
                     </div>