From 42dba6150eeac0ecc9c114c06261a542b6281c8c Mon Sep 17 00:00:00 2001
From: Artem Savchenko <armisav@gmail.com>
Date: Fri, 24 Apr 2026 11:29:22 +0700
Subject: [PATCH 1/2] Exclude guests from space owners

Signed-off-by: Artem Savchenko <armisav@gmail.com>
---
 .../src/components/navigator/CreateSpace.svelte        |  5 ++++-
 plugins/contact-resources/src/utils.ts                 | 10 ++++++++++
 .../components/docspace/CreateDocumentsSpace.svelte    |  4 +++-
 .../src/components/teamspace/CreateTeamspace.svelte    |  4 +++-
 .../drive-resources/src/components/CreateDrive.svelte  |  4 +++-
 .../lead-resources/src/components/CreateFunnel.svelte  |  4 +++-
 .../src/components/product/CreateProduct.svelte        |  4 +++-
 .../src/components/project/CreateProject.svelte        |  4 +++-
 .../src/components/projects/CreateProject.svelte       |  9 ++++++++-
 9 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/plugins/card-resources/src/components/navigator/CreateSpace.svelte b/plugins/card-resources/src/components/navigator/CreateSpace.svelte
index c68052a8f91..8eb263552cd 100644
--- a/plugins/card-resources/src/components/navigator/CreateSpace.svelte
+++ b/plugins/card-resources/src/components/navigator/CreateSpace.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { AccountArrayEditor, employeeRefByAccountUuidStore } from '@hcengineering/contact-resources'
+  import { AccountArrayEditor, employeeRefByAccountUuidStore, getAnonymousRefs } from '@hcengineering/contact-resources'
   import core, {
     AccountRole,
     AccountUuid,
@@ -51,6 +51,8 @@
   let roles = client.getModel().findAllSync(card.class.Role, { types: { $in: types } })
   $: roles = client.getModel().findAllSync(card.class.Role, { types: { $in: types } })
 
+  $: readOnlyGuestOwnerExcludeItems = getAnonymousRefs($employeeRefByAccountUuidStore)
+
   let name: string = space?.name ?? ''
 
   let isPrivate: boolean = space?.private ?? false
@@ -247,6 +249,7 @@
       </div>
       <AccountArrayEditor
         value={owners}
+        excludeItems={readOnlyGuestOwnerExcludeItems}
         label={core.string.Owners}
         onChange={handleOwnersChanged}
         kind={'regular'}
diff --git a/plugins/contact-resources/src/utils.ts b/plugins/contact-resources/src/utils.ts
index cb0eac72320..b7e5b97c4ee 100644
--- a/plugins/contact-resources/src/utils.ts
+++ b/plugins/contact-resources/src/utils.ts
@@ -67,6 +67,7 @@ import core, {
   type Permission,
   type PersonId,
   pickPrimarySocialId,
+  readOnlyGuestAccountUuid,
   type Ref,
   type SocialId,
   SocialIdType,
@@ -373,6 +374,15 @@ export const primarySocialIdByEmployeeRefStore = writable<Map<Ref<Employee>, Per
  */
 export const employeeRefByAccountUuidStore = writable<Map<AccountUuid, Ref<Employee>>>(new Map())
 
+/**
+ * {@link Ref}<{@link Person}>[] for `excludeItems` so the read-only anonymous guest never appears in pickers.
+ * Uses the same {@link employeeRefByAccountUuidStore} map as other account-based employee lookups.
+ */
+export function getAnonymousRefs (byAccount: Map<AccountUuid, Ref<Employee>>): Array<Ref<Person>> {
+  const ref = byAccount.get(readOnlyGuestAccountUuid)
+  return ref !== undefined ? [ref as unknown as Ref<Person>] : []
+}
+
 /**
  * [PersonId (social ID) => Employee] mapping
  */
diff --git a/plugins/controlled-documents-resources/src/components/docspace/CreateDocumentsSpace.svelte b/plugins/controlled-documents-resources/src/components/docspace/CreateDocumentsSpace.svelte
index 515c50bb2a8..bc9ecc63ee6 100644
--- a/plugins/controlled-documents-resources/src/components/docspace/CreateDocumentsSpace.svelte
+++ b/plugins/controlled-documents-resources/src/components/docspace/CreateDocumentsSpace.svelte
@@ -15,7 +15,7 @@
 <script lang="ts">
   import { deepEqual } from 'fast-equals'
   import { createEventDispatcher } from 'svelte'
-  import { AccountArrayEditor, employeeRefByAccountUuidStore } from '@hcengineering/contact-resources'
+  import { AccountArrayEditor, employeeRefByAccountUuidStore, getAnonymousRefs } from '@hcengineering/contact-resources'
   import core, {
     Data,
     DocumentUpdate,
@@ -58,6 +58,7 @@
 
   $: isNew = docSpace === undefined
   $: membersPersons = members.map((m) => $employeeRefByAccountUuidStore.get(m)).filter(notEmpty)
+  $: readOnlyGuestOwnerExcludeItems = getAnonymousRefs($employeeRefByAccountUuidStore)
 
   let typeId: Ref<DocumentSpaceType> | undefined = docSpace?.type ?? documents.spaceType.DocumentSpaceType
   let spaceType: WithLookup<DocumentSpaceType> | undefined
@@ -283,6 +284,7 @@
     </div>
     <AccountArrayEditor
       value={owners}
+      excludeItems={readOnlyGuestOwnerExcludeItems}
       label={core.string.Owners}
       onChange={handleOwnersChanged}
       kind={'regular'}
diff --git a/plugins/document-resources/src/components/teamspace/CreateTeamspace.svelte b/plugins/document-resources/src/components/teamspace/CreateTeamspace.svelte
index 29f4f990b3e..540546e8046 100644
--- a/plugins/document-resources/src/components/teamspace/CreateTeamspace.svelte
+++ b/plugins/document-resources/src/components/teamspace/CreateTeamspace.svelte
@@ -14,7 +14,7 @@
 -->
 <script lang="ts">
   import { deepEqual } from 'fast-equals'
-  import { AccountArrayEditor, employeeRefByAccountUuidStore } from '@hcengineering/contact-resources'
+  import { AccountArrayEditor, employeeRefByAccountUuidStore, getAnonymousRefs } from '@hcengineering/contact-resources'
   import core, {
     Data,
     DocumentUpdate,
@@ -71,6 +71,7 @@
 
   $: isNew = teamspace === undefined
   $: membersPersons = members.map((m) => $employeeRefByAccountUuidStore.get(m)).filter(notEmpty)
+  $: readOnlyGuestOwnerExcludeItems = getAnonymousRefs($employeeRefByAccountUuidStore)
 
   let typeId: Ref<SpaceType> | undefined = teamspace?.type ?? document.spaceType.DefaultTeamspaceType
   let spaceType: WithLookup<SpaceType> | undefined
@@ -377,6 +378,7 @@
       </div>
       <AccountArrayEditor
         value={owners}
+        excludeItems={readOnlyGuestOwnerExcludeItems}
         label={core.string.Owners}
         onChange={handleOwnersChanged}
         kind={'regular'}
diff --git a/plugins/drive-resources/src/components/CreateDrive.svelte b/plugins/drive-resources/src/components/CreateDrive.svelte
index 4f10b1117fc..8ef08d1f73c 100644
--- a/plugins/drive-resources/src/components/CreateDrive.svelte
+++ b/plugins/drive-resources/src/components/CreateDrive.svelte
@@ -15,7 +15,7 @@
 <script lang="ts">
   import { deepEqual } from 'fast-equals'
   import { createEventDispatcher } from 'svelte'
-  import { AccountArrayEditor, employeeRefByAccountUuidStore } from '@hcengineering/contact-resources'
+  import { AccountArrayEditor, employeeRefByAccountUuidStore, getAnonymousRefs } from '@hcengineering/contact-resources'
   import core, {
     Data,
     RolesAssignment,
@@ -58,6 +58,7 @@
   let spaceType: WithLookup<SpaceType> | undefined
 
   $: membersPersons = members.map((m) => $employeeRefByAccountUuidStore.get(m)).filter(notEmpty)
+  $: readOnlyGuestOwnerExcludeItems = getAnonymousRefs($employeeRefByAccountUuidStore)
   $: void loadSpaceType(typeId)
   const loadSpaceType = reduceCalls(async (id: typeof typeId): Promise<void> => {
     spaceType =
@@ -248,6 +249,7 @@
       </div>
       <AccountArrayEditor
         value={owners}
+        excludeItems={readOnlyGuestOwnerExcludeItems}
         label={core.string.Owners}
         onChange={handleOwnersChanged}
         kind={'regular'}
diff --git a/plugins/lead-resources/src/components/CreateFunnel.svelte b/plugins/lead-resources/src/components/CreateFunnel.svelte
index 42665e863db..ce150bed095 100644
--- a/plugins/lead-resources/src/components/CreateFunnel.svelte
+++ b/plugins/lead-resources/src/components/CreateFunnel.svelte
@@ -14,7 +14,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { AccountArrayEditor, employeeRefByAccountUuidStore } from '@hcengineering/contact-resources'
+  import { AccountArrayEditor, employeeRefByAccountUuidStore, getAnonymousRefs } from '@hcengineering/contact-resources'
   import core, {
     getCurrentAccount,
     Ref,
@@ -56,6 +56,7 @@
   let owners: AccountUuid[] = funnel?.owners !== undefined ? hierarchy.clone(funnel.owners) : [getCurrentAccount().uuid]
 
   $: membersPersons = members.map((m) => $employeeRefByAccountUuidStore.get(m)).filter(notEmpty)
+  $: readOnlyGuestOwnerExcludeItems = getAnonymousRefs($employeeRefByAccountUuidStore)
   $: void loadSpaceType(typeId)
   async function loadSpaceType (id: typeof typeId): Promise<void> {
     spaceType =
@@ -230,6 +231,7 @@
     </div>
     <AccountArrayEditor
       value={owners}
+      excludeItems={readOnlyGuestOwnerExcludeItems}
       label={core.string.Owners}
       onChange={handleOwnersChanged}
       kind={'regular'}
diff --git a/plugins/products-resources/src/components/product/CreateProduct.svelte b/plugins/products-resources/src/components/product/CreateProduct.svelte
index 272ea9113d0..ead05d2a576 100644
--- a/plugins/products-resources/src/components/product/CreateProduct.svelte
+++ b/plugins/products-resources/src/components/product/CreateProduct.svelte
@@ -23,7 +23,7 @@
   import { type Product, ProductVersionState } from '@hcengineering/products'
   import { type Attachment } from '@hcengineering/attachment'
   import { AttachmentPresenter, AttachmentStyledBox } from '@hcengineering/attachment-resources'
-  import { AccountArrayEditor, employeeRefByAccountUuidStore } from '@hcengineering/contact-resources'
+  import { AccountArrayEditor, employeeRefByAccountUuidStore, getAnonymousRefs } from '@hcengineering/contact-resources'
   import core, {
     AccountUuid,
     Data,
@@ -72,6 +72,7 @@
   let spaceType: WithLookup<SpaceType> | undefined
 
   $: membersPersons = object.members.map((m) => $employeeRefByAccountUuidStore.get(m)).filter(notEmpty)
+  $: readOnlyGuestOwnerExcludeItems = getAnonymousRefs($employeeRefByAccountUuidStore)
 
   let roles: Role[] = []
   const rolesQuery = createQuery()
@@ -327,6 +328,7 @@
 
     <AccountArrayEditor
       value={object.owners ?? []}
+      excludeItems={readOnlyGuestOwnerExcludeItems}
       label={core.string.Owners}
       emptyLabel={core.string.Owners}
       onChange={handleOwnersChanged}
diff --git a/plugins/test-management-resources/src/components/project/CreateProject.svelte b/plugins/test-management-resources/src/components/project/CreateProject.svelte
index 3220f9c9695..2ac65d2c10d 100644
--- a/plugins/test-management-resources/src/components/project/CreateProject.svelte
+++ b/plugins/test-management-resources/src/components/project/CreateProject.svelte
@@ -15,7 +15,7 @@
 <script lang="ts">
   import { deepEqual } from 'fast-equals'
   import { createEventDispatcher } from 'svelte'
-  import { AccountArrayEditor, employeeRefByAccountUuidStore } from '@hcengineering/contact-resources'
+  import { AccountArrayEditor, employeeRefByAccountUuidStore, getAnonymousRefs } from '@hcengineering/contact-resources'
   import { Asset } from '@hcengineering/platform'
   import core, {
     Data,
@@ -64,6 +64,7 @@
   let members: AccountUuid[] =
     project?.members !== undefined ? hierarchy.clone(project.members) : [getCurrentAccount().uuid]
   $: membersPersons = members.map((m) => $employeeRefByAccountUuidStore.get(m)).filter(notEmpty)
+  $: readOnlyGuestOwnerExcludeItems = getAnonymousRefs($employeeRefByAccountUuidStore)
   let owners: AccountUuid[] =
     project?.owners !== undefined ? hierarchy.clone(project.owners) : [getCurrentAccount().uuid]
   let rolesAssignment: RolesAssignment = {}
@@ -343,6 +344,7 @@
         </div>
         <AccountArrayEditor
           value={owners}
+          excludeItems={readOnlyGuestOwnerExcludeItems}
           label={core.string.Owners}
           onChange={handleOwnersChanged}
           kind={'regular'}
diff --git a/plugins/tracker-resources/src/components/projects/CreateProject.svelte b/plugins/tracker-resources/src/components/projects/CreateProject.svelte
index 7b80f187291..62213ffcb40 100644
--- a/plugins/tracker-resources/src/components/projects/CreateProject.svelte
+++ b/plugins/tracker-resources/src/components/projects/CreateProject.svelte
@@ -15,7 +15,12 @@
 <script lang="ts">
   import { Analytics } from '@hcengineering/analytics'
   import { Employee } from '@hcengineering/contact'
-  import { AccountArrayEditor, AssigneeBox, employeeRefByAccountUuidStore } from '@hcengineering/contact-resources'
+  import {
+    AccountArrayEditor,
+    AssigneeBox,
+    employeeRefByAccountUuidStore,
+    getAnonymousRefs
+  } from '@hcengineering/contact-resources'
   import core, {
     AccountRole,
     AccountUuid,
@@ -83,6 +88,7 @@
   let typeId: Ref<ProjectType> | undefined = project?.type
   $: typeType = typeId !== undefined ? $typeStore.get(typeId) : undefined
   $: membersPersons = members.map((m) => $employeeRefByAccountUuidStore.get(m)).filter(notEmpty)
+  $: readOnlyGuestOwnerExcludeItems = getAnonymousRefs($employeeRefByAccountUuidStore)
   let autoJoin = project?.autoJoin ?? typeType?.autoJoin ?? false
   let autoJoinForRoles: AccountRole[] =
     project?.autoJoinForRoles != null ? hierarchy.clone(project.autoJoinForRoles) : []
@@ -512,6 +518,7 @@
       </div>
       <AccountArrayEditor
         value={owners}
+        excludeItems={readOnlyGuestOwnerExcludeItems}
         label={core.string.Owners}
         allowGuests
         onChange={handleOwnersChanged}

From ba95cc9ca5a378536230a4eb06ae4bad7aef3d05 Mon Sep 17 00:00:00 2001
From: Artem Savchenko <armisav@gmail.com>
Date: Fri, 24 Apr 2026 11:52:35 +0700
Subject: [PATCH 2/2] Show guest if he is in owners

Signed-off-by: Artem Savchenko <armisav@gmail.com>
---
 .../src/components/navigator/CreateSpace.svelte      |  2 +-
 plugins/contact-resources/src/utils.ts               | 12 +++++++++---
 .../components/docspace/CreateDocumentsSpace.svelte  |  2 +-
 .../src/components/teamspace/CreateTeamspace.svelte  |  2 +-
 .../src/components/CreateDrive.svelte                |  2 +-
 .../src/components/CreateFunnel.svelte               |  2 +-
 .../src/components/product/CreateProduct.svelte      |  2 +-
 .../src/components/project/CreateProject.svelte      |  2 +-
 .../src/components/projects/CreateProject.svelte     |  2 +-
 9 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/plugins/card-resources/src/components/navigator/CreateSpace.svelte b/plugins/card-resources/src/components/navigator/CreateSpace.svelte
index 8eb263552cd..37a9d8a1f1a 100644
--- a/plugins/card-resources/src/components/navigator/CreateSpace.svelte
+++ b/plugins/card-resources/src/components/navigator/CreateSpace.svelte
@@ -51,7 +51,7 @@
   let roles = client.getModel().findAllSync(card.class.Role, { types: { $in: types } })
   $: roles = client.getModel().findAllSync(card.class.Role, { types: { $in: types } })
 
-  $: readOnlyGuestOwnerExcludeItems = getAnonymousRefs($employeeRefByAccountUuidStore)
+  $: readOnlyGuestOwnerExcludeItems = getAnonymousRefs($employeeRefByAccountUuidStore, owners)
 
   let name: string = space?.name ?? ''
 
diff --git a/plugins/contact-resources/src/utils.ts b/plugins/contact-resources/src/utils.ts
index b7e5b97c4ee..88eec57a5c3 100644
--- a/plugins/contact-resources/src/utils.ts
+++ b/plugins/contact-resources/src/utils.ts
@@ -375,10 +375,16 @@ export const primarySocialIdByEmployeeRefStore = writable<Map<Ref<Employee>, Per
 export const employeeRefByAccountUuidStore = writable<Map<AccountUuid, Ref<Employee>>>(new Map())
 
 /**
- * {@link Ref}<{@link Person}>[] for `excludeItems` so the read-only anonymous guest never appears in pickers.
- * Uses the same {@link employeeRefByAccountUuidStore} map as other account-based employee lookups.
+ * {@link Ref}<{@link Person}>[] for `excludeItems` so the read-only anonymous guest does not appear in the picker
+ * when not already selected. If they are in `selectedAccountUuids`, returns [] so they stay visible among chips.
  */
-export function getAnonymousRefs (byAccount: Map<AccountUuid, Ref<Employee>>): Array<Ref<Person>> {
+export function getAnonymousRefs (
+  byAccount: Map<AccountUuid, Ref<Employee>>,
+  selectedAccountUuids: readonly AccountUuid[] = []
+): Array<Ref<Person>> {
+  if (selectedAccountUuids.includes(readOnlyGuestAccountUuid)) {
+    return []
+  }
   const ref = byAccount.get(readOnlyGuestAccountUuid)
   return ref !== undefined ? [ref as unknown as Ref<Person>] : []
 }
diff --git a/plugins/controlled-documents-resources/src/components/docspace/CreateDocumentsSpace.svelte b/plugins/controlled-documents-resources/src/components/docspace/CreateDocumentsSpace.svelte
index bc9ecc63ee6..52f47eaef8d 100644
--- a/plugins/controlled-documents-resources/src/components/docspace/CreateDocumentsSpace.svelte
+++ b/plugins/controlled-documents-resources/src/components/docspace/CreateDocumentsSpace.svelte
@@ -58,7 +58,7 @@
 
   $: isNew = docSpace === undefined
   $: membersPersons = members.map((m) => $employeeRefByAccountUuidStore.get(m)).filter(notEmpty)
-  $: readOnlyGuestOwnerExcludeItems = getAnonymousRefs($employeeRefByAccountUuidStore)
+  $: readOnlyGuestOwnerExcludeItems = getAnonymousRefs($employeeRefByAccountUuidStore, owners)
 
   let typeId: Ref<DocumentSpaceType> | undefined = docSpace?.type ?? documents.spaceType.DocumentSpaceType
   let spaceType: WithLookup<DocumentSpaceType> | undefined
diff --git a/plugins/document-resources/src/components/teamspace/CreateTeamspace.svelte b/plugins/document-resources/src/components/teamspace/CreateTeamspace.svelte
index 540546e8046..528c97077ae 100644
--- a/plugins/document-resources/src/components/teamspace/CreateTeamspace.svelte
+++ b/plugins/document-resources/src/components/teamspace/CreateTeamspace.svelte
@@ -71,7 +71,7 @@
 
   $: isNew = teamspace === undefined
   $: membersPersons = members.map((m) => $employeeRefByAccountUuidStore.get(m)).filter(notEmpty)
-  $: readOnlyGuestOwnerExcludeItems = getAnonymousRefs($employeeRefByAccountUuidStore)
+  $: readOnlyGuestOwnerExcludeItems = getAnonymousRefs($employeeRefByAccountUuidStore, owners)
 
   let typeId: Ref<SpaceType> | undefined = teamspace?.type ?? document.spaceType.DefaultTeamspaceType
   let spaceType: WithLookup<SpaceType> | undefined
diff --git a/plugins/drive-resources/src/components/CreateDrive.svelte b/plugins/drive-resources/src/components/CreateDrive.svelte
index 8ef08d1f73c..46d5a5d71ba 100644
--- a/plugins/drive-resources/src/components/CreateDrive.svelte
+++ b/plugins/drive-resources/src/components/CreateDrive.svelte
@@ -58,7 +58,7 @@
   let spaceType: WithLookup<SpaceType> | undefined
 
   $: membersPersons = members.map((m) => $employeeRefByAccountUuidStore.get(m)).filter(notEmpty)
-  $: readOnlyGuestOwnerExcludeItems = getAnonymousRefs($employeeRefByAccountUuidStore)
+  $: readOnlyGuestOwnerExcludeItems = getAnonymousRefs($employeeRefByAccountUuidStore, owners)
   $: void loadSpaceType(typeId)
   const loadSpaceType = reduceCalls(async (id: typeof typeId): Promise<void> => {
     spaceType =
diff --git a/plugins/lead-resources/src/components/CreateFunnel.svelte b/plugins/lead-resources/src/components/CreateFunnel.svelte
index ce150bed095..f498685ac46 100644
--- a/plugins/lead-resources/src/components/CreateFunnel.svelte
+++ b/plugins/lead-resources/src/components/CreateFunnel.svelte
@@ -56,7 +56,7 @@
   let owners: AccountUuid[] = funnel?.owners !== undefined ? hierarchy.clone(funnel.owners) : [getCurrentAccount().uuid]
 
   $: membersPersons = members.map((m) => $employeeRefByAccountUuidStore.get(m)).filter(notEmpty)
-  $: readOnlyGuestOwnerExcludeItems = getAnonymousRefs($employeeRefByAccountUuidStore)
+  $: readOnlyGuestOwnerExcludeItems = getAnonymousRefs($employeeRefByAccountUuidStore, owners)
   $: void loadSpaceType(typeId)
   async function loadSpaceType (id: typeof typeId): Promise<void> {
     spaceType =
diff --git a/plugins/products-resources/src/components/product/CreateProduct.svelte b/plugins/products-resources/src/components/product/CreateProduct.svelte
index ead05d2a576..c9c803b7a88 100644
--- a/plugins/products-resources/src/components/product/CreateProduct.svelte
+++ b/plugins/products-resources/src/components/product/CreateProduct.svelte
@@ -72,7 +72,7 @@
   let spaceType: WithLookup<SpaceType> | undefined
 
   $: membersPersons = object.members.map((m) => $employeeRefByAccountUuidStore.get(m)).filter(notEmpty)
-  $: readOnlyGuestOwnerExcludeItems = getAnonymousRefs($employeeRefByAccountUuidStore)
+  $: readOnlyGuestOwnerExcludeItems = getAnonymousRefs($employeeRefByAccountUuidStore, object.owners ?? [])
 
   let roles: Role[] = []
   const rolesQuery = createQuery()
diff --git a/plugins/test-management-resources/src/components/project/CreateProject.svelte b/plugins/test-management-resources/src/components/project/CreateProject.svelte
index 2ac65d2c10d..099a8395ce6 100644
--- a/plugins/test-management-resources/src/components/project/CreateProject.svelte
+++ b/plugins/test-management-resources/src/components/project/CreateProject.svelte
@@ -64,7 +64,7 @@
   let members: AccountUuid[] =
     project?.members !== undefined ? hierarchy.clone(project.members) : [getCurrentAccount().uuid]
   $: membersPersons = members.map((m) => $employeeRefByAccountUuidStore.get(m)).filter(notEmpty)
-  $: readOnlyGuestOwnerExcludeItems = getAnonymousRefs($employeeRefByAccountUuidStore)
+  $: readOnlyGuestOwnerExcludeItems = getAnonymousRefs($employeeRefByAccountUuidStore, owners)
   let owners: AccountUuid[] =
     project?.owners !== undefined ? hierarchy.clone(project.owners) : [getCurrentAccount().uuid]
   let rolesAssignment: RolesAssignment = {}
diff --git a/plugins/tracker-resources/src/components/projects/CreateProject.svelte b/plugins/tracker-resources/src/components/projects/CreateProject.svelte
index 62213ffcb40..c4449741587 100644
--- a/plugins/tracker-resources/src/components/projects/CreateProject.svelte
+++ b/plugins/tracker-resources/src/components/projects/CreateProject.svelte
@@ -88,7 +88,7 @@
   let typeId: Ref<ProjectType> | undefined = project?.type
   $: typeType = typeId !== undefined ? $typeStore.get(typeId) : undefined
   $: membersPersons = members.map((m) => $employeeRefByAccountUuidStore.get(m)).filter(notEmpty)
-  $: readOnlyGuestOwnerExcludeItems = getAnonymousRefs($employeeRefByAccountUuidStore)
+  $: readOnlyGuestOwnerExcludeItems = getAnonymousRefs($employeeRefByAccountUuidStore, owners)
   let autoJoin = project?.autoJoin ?? typeType?.autoJoin ?? false
   let autoJoinForRoles: AccountRole[] =
     project?.autoJoinForRoles != null ? hierarchy.clone(project.autoJoinForRoles) : []