diff --git a/plugins/controlled-documents-resources/src/components/document/DocumentSignatories.svelte b/plugins/controlled-documents-resources/src/components/document/DocumentSignatories.svelte
index 390a3197cc..4930ee6b87 100644
--- a/plugins/controlled-documents-resources/src/components/document/DocumentSignatories.svelte
+++ b/plugins/controlled-documents-resources/src/components/document/DocumentSignatories.svelte
@@ -14,7 +14,7 @@
 -->
 <script lang="ts">
   import { Employee, Person, formatName } from '@hcengineering/contact'
-  import { employeeByIdStore, personIdByAccountId } from '@hcengineering/contact-resources'
+  import { employeeByIdStore, personRefByPersonIdStore } from '@hcengineering/contact-resources'
   import documents, {
     DocumentRequest,
     emptyBundle,
@@ -53,7 +53,7 @@
       DocumentRequest: requests,
       DocumentSnapshot: $documentSnapshots
     },
-    (ref) => $personIdByAccountId.get(ref)
+    (ref) => $personRefByPersonIdStore.get(ref)
   )
 
   $: state = (doc ? workflow?.get(doc._id) ?? [] : [])[0]
diff --git a/plugins/controlled-documents-resources/src/components/document/right-panel/DocumentApprovalsTab.svelte b/plugins/controlled-documents-resources/src/components/document/right-panel/DocumentApprovalsTab.svelte
index 61149a69f5..7dd4ae3d06 100644
--- a/plugins/controlled-documents-resources/src/components/document/right-panel/DocumentApprovalsTab.svelte
+++ b/plugins/controlled-documents-resources/src/components/document/right-panel/DocumentApprovalsTab.svelte
@@ -6,12 +6,12 @@
     emptyBundle,
     extractValidationWorkflow
   } from '@hcengineering/controlled-documents'
-  import { SortingOrder } from '@hcengineering/core'
 
   import { createQuery, getClient } from '@hcengineering/presentation'
   import { Label, Scroller } from '@hcengineering/ui'
 
-  import { personIdByAccountId } from '@hcengineering/contact-resources'
+  import chunter, { ChatMessage } from '@hcengineering/chunter'
+  import { personRefByPersonIdStore } from '@hcengineering/contact-resources'
   import documentsRes from '../../../plugin'
   import {
     $controlledDocument as controlledDocument,
@@ -20,7 +20,6 @@
   import DocumentApprovalGuideItem from './DocumentApprovalGuideItem.svelte'
   import DocumentApprovalItem from './DocumentApprovalItem.svelte'
   import RightPanelTabHeader from './RightPanelTabHeader.svelte'
-  import chunter, { ChatMessage } from '@hcengineering/chunter'
 
   const client = getClient()
   const hierarchy = client.getHierarchy()
@@ -52,7 +51,7 @@
       DocumentSnapshot: $documentSnapshots,
       ChatMessage: messages
     },
-    (ref) => $personIdByAccountId.get(ref)
+    (ref) => $personRefByPersonIdStore.get(ref)
   )
 
   $: validationStates = ((doc ? workflow.get(doc._id) : []) ?? []).slice()
diff --git a/plugins/controlled-documents/src/utils.ts b/plugins/controlled-documents/src/utils.ts
index 81b11a9738..65c1f7bbaa 100644
--- a/plugins/controlled-documents/src/utils.ts
+++ b/plugins/controlled-documents/src/utils.ts
@@ -21,7 +21,6 @@ import {
   DocumentQuery,
   DocumentUpdate,
   Hierarchy,
-  getCurrentAccount,
   Rank,
   Ref,
   SortingOrder,
@@ -29,7 +28,6 @@ import {
   Timestamp,
   toIdMap,
   TxOperations,
-  type SocialId,
   type PersonId
 } from '@hcengineering/core'
 import { LexoDecimal, LexoNumeralSystem36, LexoRank } from 'lexorank'
@@ -39,7 +37,7 @@ import documents from './plugin'
 
 import attachment, { Attachment } from '@hcengineering/attachment'
 import chunter, { ChatMessage } from '@hcengineering/chunter'
-import { Person, Employee, getCurrentEmployee } from '@hcengineering/contact'
+import { Employee, getCurrentEmployee, Person } from '@hcengineering/contact'
 import { makeRank } from '@hcengineering/rank'
 import tags, { TagReference } from '@hcengineering/tags'
 import {
@@ -738,9 +736,7 @@ export function extractValidationWorkflow (
 
       const anchor = review ?? approval
       const author =
-        anchor?.createdBy !== undefined
-          ? accountIdToPerson?.(anchor.createdBy) ?? document.author
-          : document.author
+        anchor?.createdBy !== undefined ? accountIdToPerson?.(anchor.createdBy) ?? document.author : document.author
 
       state.approvals = [
         {