diff --git a/messages/en-US.json b/messages/en-US.json
index 836fa0a80..2c8ac950b 100644
--- a/messages/en-US.json
+++ b/messages/en-US.json
@@ -380,7 +380,7 @@
     "userTitle": "Manage All Users",
     "userDescription": "View and manage all users in the system",
     "userAbount": "About User Management",
-    "userAbountDescription": "This table displays all root user objects in the system. Each user may belong to multiple organizations. Removing a user from an organization does not delete their root user object - they will remain in the system. To completely remove a user from the system, you must delete their root user object using the delete action in this table.",
+    "userAbountDescription": "This table displays all base user objects in the system. Each user may belong to multiple organizations. Removing a user from an organization does not delete their base user object. They will remain in the system. To completely remove a user from the system, you must delete their base user object using the delete action in this table.",
     "userServer": "Server Users",
     "userSearch": "Search server users...",
     "userErrorDelete": "Error deleting user",
diff --git a/server/routers/domain/listDomains.ts b/server/routers/domain/listDomains.ts
index 085acf0c6..94dddb1cf 100644
--- a/server/routers/domain/listDomains.ts
+++ b/server/routers/domain/listDomains.ts
@@ -103,7 +103,8 @@ export async function listDomains(
 
         const [{ count }] = await db
             .select({ count: sql<number>`count(*)` })
-            .from(domains);
+            .from(orgDomains)
+            .where(eq(orgDomains.orgId, orgId));
 
         return response<ListDomainsResponse>(res, {
             data: {