diff --git a/drb-frontend/app/settings/layout.tsx b/drb-frontend/app/settings/layout.tsx
index 34cf352..744ed72 100644
--- a/drb-frontend/app/settings/layout.tsx
+++ b/drb-frontend/app/settings/layout.tsx
@@ -15,15 +15,22 @@ const TABS = [
 ];
 
 export default function SettingsLayout({ children }: { children: React.ReactNode }) {
-  const { isAdmin, loading } = useAuth();
+  // SAAS_PLAN.md B7: this used to gate on isAdmin (platform admin) alone,
+  // which meant a paying customer who is their own org's owner couldn't
+  // reach their own billing/members/node-ownership settings — "admin" here
+  // conflated "platform operator" with "org owner". isAdmin still passes
+  // (support/debugging access to any org's settings), but org_role ===
+  // "owner" is now sufficient on its own.
+  const { isAdmin, isOrgOwner, loading } = useAuth();
+  const canAccess = isAdmin || isOrgOwner;
   const pathname = usePathname();
   const router = useRouter();
 
   useEffect(() => {
-    if (!loading && !isAdmin) router.replace("/dashboard");
-  }, [loading, isAdmin, router]);
+    if (!loading && !canAccess) router.replace("/dashboard");
+  }, [loading, canAccess, router]);
 
-  if (loading || !isAdmin) return null;
+  if (loading || !canAccess) return null;
 
   return (
     <div className="space-y-6">
diff --git a/drb-frontend/app/settings/nodes/page.tsx b/drb-frontend/app/settings/nodes/page.tsx
index a36cf38..dc01f8a 100644
--- a/drb-frontend/app/settings/nodes/page.tsx
+++ b/drb-frontend/app/settings/nodes/page.tsx
@@ -3,15 +3,168 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
 import Link from "next/link";
 import { useNodes } from "@/lib/useNodes";
+import { useAuth } from "@/components/AuthProvider";
 import { c2api } from "@/lib/c2api";
 import type { UserRecord } from "@/lib/types";
 import { StatusBadge } from "@/components/StatusBadge";
-import { Card } from "@/components/ui/Card";
+import { Card, CardHeader } from "@/components/ui/Card";
+import { Button } from "@/components/ui/Button";
 import { ErrorBanner } from "@/components/ui/EmptyState";
 import { SkeletonRow } from "@/components/ui/Skeleton";
 
 const UNASSIGNED = "__unassigned__";
 
+interface EnrollmentToken {
+  token_id: string;
+  label: string;
+  created_at: string;
+  revoked: boolean;
+  uses: number;
+}
+
+/**
+ * SAAS_PLAN.md B2b — per-org enrollment tokens (routers/org.py). This is the
+ * credential a customer's field node presents to POST /nodes/enroll
+ * (X-Enrollment-Token) so it lands in THIS org instead of the legacy
+ * fleet-wide pool. Minting/revoking is owner-only server-side; any org
+ * member can list (metadata only, the raw token is shown exactly once at
+ * mint time and never again).
+ */
+function EnrollmentTokensPanel() {
+  const { isOrgOwner, isAdmin } = useAuth();
+  const canManage = isOrgOwner || isAdmin;
+  const [tokens, setTokens] = useState<EnrollmentToken[]>([]);
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState<string | null>(null);
+  const [label, setLabel] = useState("");
+  const [minting, setMinting] = useState(false);
+  const [justMinted, setJustMinted] = useState<string | null>(null);
+
+  const load = useCallback(() => {
+    c2api.listEnrollmentTokens()
+      .then(setTokens)
+      .catch((e) => setError(e instanceof Error ? e.message : String(e)))
+      .finally(() => setLoading(false));
+  }, []);
+
+  useEffect(() => { load(); }, [load]);
+
+  async function handleMint(e: React.FormEvent) {
+    e.preventDefault();
+    if (!label.trim()) return;
+    setMinting(true);
+    setError(null);
+    try {
+      const result = await c2api.mintEnrollmentToken(label.trim());
+      setJustMinted(result.token);
+      setLabel("");
+      load();
+    } catch (err) {
+      setError(err instanceof Error ? err.message : String(err));
+    } finally {
+      setMinting(false);
+    }
+  }
+
+  async function handleRevoke(tokenId: string) {
+    try {
+      await c2api.revokeEnrollmentToken(tokenId);
+      load();
+    } catch (err) {
+      setError(err instanceof Error ? err.message : String(err));
+    }
+  }
+
+  return (
+    <Card>
+      <CardHeader
+        title="Enrollment tokens"
+        subtitle="Give a new field node one of these instead of an admin-issued key — it enrolls straight into this org."
+      />
+
+      {justMinted && (
+        <div className="bg-indigo-900/30 border border-indigo-700/50 rounded-lg p-3 mb-4">
+          <p className="text-xs text-indigo-200 font-mono mb-1">
+            New token — copy it now, it won&apos;t be shown again:
+          </p>
+          <p className="text-xs text-indigo-100 font-mono break-all bg-gray-900 rounded px-2 py-1.5">{justMinted}</p>
+          <button
+            type="button"
+            onClick={() => setJustMinted(null)}
+            className="text-xs text-indigo-300 hover:text-indigo-200 mt-2 transition-colors"
+          >
+            Dismiss
+          </button>
+        </div>
+      )}
+
+      {error && <ErrorBanner message={error} />}
+
+      {canManage && (
+        <form onSubmit={handleMint} className="flex flex-wrap gap-2 mb-4">
+          <input
+            value={label}
+            onChange={(e) => setLabel(e.target.value)}
+            placeholder="Label, e.g. 'node-003 field kit'"
+            className="flex-1 min-w-[12rem] bg-gray-800 border border-gray-700 rounded-lg px-3 py-1.5 text-white text-sm focus:outline-none focus:border-indigo-500"
+          />
+          <Button type="submit" size="sm" disabled={minting || !label.trim()}>
+            {minting ? "Minting…" : "New token"}
+          </Button>
+        </form>
+      )}
+
+      {loading ? (
+        <div className="space-y-2">
+          <SkeletonRow cols={1} />
+        </div>
+      ) : tokens.length === 0 ? (
+        <p className="text-gray-600 text-xs">No enrollment tokens yet.</p>
+      ) : (
+        <table className="w-full text-sm">
+          <thead>
+            <tr className="text-xs text-gray-500 uppercase tracking-wider border-b border-gray-800">
+              <th className="py-2 text-left">Label</th>
+              <th className="py-2 text-left hidden sm:table-cell">Created</th>
+              <th className="py-2 text-left">Status</th>
+              {canManage && <th className="py-2 text-right">Actions</th>}
+            </tr>
+          </thead>
+          <tbody>
+            {tokens.map((t) => (
+              <tr key={t.token_id} className="border-b border-gray-800 last:border-0">
+                <td className="py-2 text-white">{t.label}</td>
+                <td className="py-2 text-gray-500 text-xs hidden sm:table-cell">
+                  {new Date(t.created_at).toLocaleDateString()}
+                </td>
+                <td className="py-2 text-xs">
+                  {t.revoked ? (
+                    <span className="text-gray-600">Revoked</span>
+                  ) : (
+                    <span className="text-green-400">Active · {t.uses} use{t.uses !== 1 ? "s" : ""}</span>
+                  )}
+                </td>
+                {canManage && (
+                  <td className="py-2 text-right">
+                    {!t.revoked && (
+                      <button
+                        onClick={() => handleRevoke(t.token_id)}
+                        className="text-xs text-red-400 hover:text-red-300 transition-colors"
+                      >
+                        Revoke
+                      </button>
+                    )}
+                  </td>
+                )}
+              </tr>
+            ))}
+          </tbody>
+        </table>
+      )}
+    </Card>
+  );
+}
+
 export default function NodeOwnershipSettingsPage() {
   const { nodes, loading: nodesLoading } = useNodes();
   const [users, setUsers] = useState<UserRecord[]>([]);
@@ -69,12 +222,15 @@ export default function NodeOwnershipSettingsPage() {
   const loading = nodesLoading || loadingUsers;
 
   return (
-    <div className="space-y-4">
-      <p className="text-sm text-gray-500">
-        Assign each node to the operator responsible for it. Operators only see and manage the nodes assigned to them here.
-      </p>
+    <div className="space-y-6">
+      <EnrollmentTokensPanel />
 
-      {error && <ErrorBanner message={error} />}
+      <div className="space-y-4">
+        <p className="text-sm text-gray-500">
+          Assign each node to the operator responsible for it. Operators only see and manage the nodes assigned to them here.
+        </p>
+
+        {error && <ErrorBanner message={error} />}
 
       <Card padding="none" className="overflow-hidden">
         <table className="w-full text-sm">
@@ -122,6 +278,7 @@ export default function NodeOwnershipSettingsPage() {
           </tbody>
         </table>
       </Card>
+      </div>
     </div>
   );
 }
diff --git a/drb-frontend/app/settings/organization/page.tsx b/drb-frontend/app/settings/organization/page.tsx
index b177773..e74e31d 100644
--- a/drb-frontend/app/settings/organization/page.tsx
+++ b/drb-frontend/app/settings/organization/page.tsx
@@ -3,6 +3,7 @@
 import { useEffect, useState } from "react";
 import Link from "next/link";
 import { c2api } from "@/lib/c2api";
+import { useAuth } from "@/components/AuthProvider";
 import { useNodes } from "@/lib/useNodes";
 import { getCurrentSubscription, getPlan, type Subscription } from "@/lib/billing";
 import { Card, CardHeader } from "@/components/ui/Card";
@@ -21,15 +22,40 @@ function StatTile({ label, value }: { label: string; value: string | number }) {
 
 export default function OrganizationSettingsPage() {
   const { nodes } = useNodes();
+  const { isOrgOwner, isAdmin } = useAuth();
   const [memberCount, setMemberCount] = useState<number | null>(null);
   const [sub, setSub] = useState<Subscription | null>(null);
-  const [orgName, setOrgName] = useState("My Organization");
+  const [orgName, setOrgName] = useState("");
+  const [savedName, setSavedName] = useState("");
+  const [orgLoading, setOrgLoading] = useState(true);
+  const [saving, setSaving] = useState(false);
+  const [saveError, setSaveError] = useState<string | null>(null);
+
+  const canEdit = isOrgOwner || isAdmin;
 
   useEffect(() => {
     c2api.listUsers().then((u) => setMemberCount(u.length)).catch(() => setMemberCount(null));
     getCurrentSubscription().then(setSub);
+    c2api.getOrg()
+      .then((org) => { setOrgName(org.name); setSavedName(org.name); })
+      .catch(() => {})
+      .finally(() => setOrgLoading(false));
   }, []);
 
+  async function handleSave() {
+    setSaving(true);
+    setSaveError(null);
+    try {
+      const res = await c2api.updateOrg(orgName.trim());
+      setSavedName(res.name);
+      setOrgName(res.name);
+    } catch (err) {
+      setSaveError(err instanceof Error ? err.message : "Could not save.");
+    } finally {
+      setSaving(false);
+    }
+  }
+
   const plan = sub ? getPlan(sub.planId) : null;
 
   return (
@@ -44,17 +70,21 @@ export default function OrganizationSettingsPage() {
             <label className="text-xs text-gray-400 block mb-1">Organization name</label>
             <input
               value={orgName}
+              disabled={orgLoading || !canEdit}
               onChange={(e) => setOrgName(e.target.value)}
-              className="w-full bg-gray-800 border border-gray-700 rounded-lg px-3 py-2 text-white text-sm focus:outline-none focus:border-indigo-500"
+              className="w-full bg-gray-800 border border-gray-700 rounded-lg px-3 py-2 text-white text-sm focus:outline-none focus:border-indigo-500 disabled:opacity-50"
             />
           </div>
+          {saveError && <p className="text-red-400 text-xs">{saveError}</p>}
           <div className="flex items-center gap-3">
-            <Button size="sm" disabled title="Organization profile isn't persisted server-side yet">
-              Save changes
+            <Button
+              size="sm"
+              disabled={orgLoading || !canEdit || saving || !orgName.trim() || orgName.trim() === savedName}
+              onClick={handleSave}
+              title={!canEdit ? "Only the organization owner can change this" : undefined}
+            >
+              {saving ? "Saving…" : "Save changes"}
             </Button>
-            <span className="text-xs text-gray-600 font-mono">
-              Preview only — no backend endpoint stores this yet.
-            </span>
           </div>
         </div>
       </Card>
diff --git a/drb-frontend/components/Nav.tsx b/drb-frontend/components/Nav.tsx
index b79dc01..23895a0 100644
--- a/drb-frontend/components/Nav.tsx
+++ b/drb-frontend/components/Nav.tsx
@@ -7,6 +7,7 @@ import { useUnconfiguredNodes } from "@/lib/useNodes";
 import { useUnacknowledgedAlerts } from "@/lib/useAlerts";
 import { useAuth } from "@/components/AuthProvider";
 import { useTheme } from "@/components/ThemeProvider";
+import { FOUNDING_ORG_ID } from "@/lib/tenancy";
 
 // Links visible to all authenticated roles (viewer+)
 const viewerLinks = [
@@ -15,9 +16,13 @@ const viewerLinks = [
   { href: "/incidents", label: "Incidents" },
   { href: "/map",       label: "Map" },
   { href: "/alerts",    label: "Alerts" },
-  { href: "/trips",     label: "Trips" },
 ];
 
+// Trips is an internal utility feature, not a tenant-scoped product surface
+// (see [[trips-feature-intentional]] and SAAS_PLAN.md B7) — shown only to
+// the founding org, matching routers/trips.py's own gating.
+const tripsLink = { href: "/trips", label: "Trips" };
+
 // Additional links for operators and admins
 const operatorLinks = [
   { href: "/nodes",   label: "Nodes" },
@@ -25,10 +30,10 @@ const operatorLinks = [
   { href: "/tokens",  label: "Tokens" },
 ];
 
-// Admin-only links
+// Platform-admin-only link. Settings is handled separately below — it's
+// customer-facing for org owners too, not admin-only (SAAS_PLAN.md B7).
 const adminLinks = [
   { href: "/admin", label: "Admin" },
-  { href: "/settings", label: "Settings" },
 ];
 
 function SunIcon() {
@@ -56,7 +61,7 @@ function MoonIcon() {
 }
 
 export function Nav() {
-  const { user, isAdmin, isOperator } = useAuth();
+  const { user, isAdmin, isOperator, isOrgOwner, orgId } = useAuth();
   const pathname = usePathname();
   const router = useRouter();
   const { nodes: pending } = useUnconfiguredNodes();
@@ -68,8 +73,10 @@ export function Nav() {
 
   const allLinks = [
     ...viewerLinks,
+    ...(orgId === FOUNDING_ORG_ID || isAdmin ? [tripsLink] : []),
     ...(isAdmin || isOperator ? operatorLinks : []),
     ...(isAdmin ? adminLinks : []),
+    ...(isAdmin || isOrgOwner ? [{ href: "/settings", label: "Settings" }] : []),
   ];
 
   function navLinkClass(href: string) {
diff --git a/drb-frontend/lib/tenancy.ts b/drb-frontend/lib/tenancy.ts
new file mode 100644
index 0000000..855c192
--- /dev/null
+++ b/drb-frontend/lib/tenancy.ts
@@ -0,0 +1,10 @@
+/**
+ * Mirrors drb-c2-core/app/internal/tenancy.py's FOUNDING_ORG_ID — the org
+ * every pre-tenancy document and every legacy enrollment path resolves
+ * into. Frontend-side, it's used only to gate the /trips feature (an
+ * internal utility riding along on this stack, not a tenant-scoped product
+ * surface — see [[trips-feature-intentional]] and SAAS_PLAN.md B7) to the
+ * founding org, matching the same restriction the backend already enforces
+ * in routers/trips.py.
+ */
+export const FOUNDING_ORG_ID = "founding";