diff --git a/plugins/controlled-documents-resources/src/components/EditDocPanel.svelte b/plugins/controlled-documents-resources/src/components/EditDocPanel.svelte
index df95feb8f9..0e1a62af30 100644
--- a/plugins/controlled-documents-resources/src/components/EditDocPanel.svelte
+++ b/plugins/controlled-documents-resources/src/components/EditDocPanel.svelte
@@ -45,6 +45,8 @@
   import { getProjectDocumentLink } from '../navigation'
   import documentRes from '../plugin'
   import {
+    $approvalRequest as approvalRequest,
+    $reviewRequest as reviewRequest,
     $activeRightPanelTab as activeRightPanelTab,
     $availableEditorModes as availableEditorModes,
     $availableRightPanelTabs as availableRightPanelTabs,
@@ -140,7 +142,12 @@
     {
       label: documentRes.string.TeamTab,
       component: EditDocTeam,
-      props: { controlledDoc: $controlledDocument, editable: $isDocumentOwner }
+      props: {
+        controlledDoc: $controlledDocument,
+        editable: $isDocumentOwner,
+        reviewRequest: $reviewRequest,
+        approvalRequest: $approvalRequest
+      }
     },
     {
       label: documentRes.string.ReleaseTab,
diff --git a/plugins/controlled-documents-resources/src/components/document/DocTeam.svelte b/plugins/controlled-documents-resources/src/components/document/DocTeam.svelte
index 1b1c6b827e..56e076da6f 100644
--- a/plugins/controlled-documents-resources/src/components/document/DocTeam.svelte
+++ b/plugins/controlled-documents-resources/src/components/document/DocTeam.svelte
@@ -25,14 +25,13 @@
   export let canChangeReviewers: boolean = true
   export let canChangeApprovers: boolean = true
   export let canChangeCoAuthors: boolean = true
+  export let reviewers: Ref<Employee>[] = controlledDoc?.reviewers ?? []
+  export let approvers: Ref<Employee>[] = controlledDoc?.approvers ?? []
+  export let coAuthors: Ref<Employee>[] = controlledDoc?.coAuthors ?? []
 
   const dispatch = createEventDispatcher()
   const currentEmployee = getCurrentEmployee()
 
-  $: reviewers = controlledDoc.reviewers
-  $: approvers = controlledDoc.approvers
-  $: coAuthors = controlledDoc.coAuthors
-
   $: permissionsSpace = space === documents.space.UnsortedTemplates ? documents.space.QualityDocuments : space
 
   function getPermittedPersons (
diff --git a/plugins/controlled-documents-resources/src/components/document/EditDocTeam.svelte b/plugins/controlled-documents-resources/src/components/document/EditDocTeam.svelte
index a1014dd9c6..993b93cdec 100644
--- a/plugins/controlled-documents-resources/src/components/document/EditDocTeam.svelte
+++ b/plugins/controlled-documents-resources/src/components/document/EditDocTeam.svelte
@@ -13,37 +13,92 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Scroller } from '@hcengineering/ui'
+  import { Employee, Person } from '@hcengineering/contact'
+  import {
+    ControlledDocument,
+    ControlledDocumentState,
+    DocumentApprovalRequest,
+    DocumentReviewRequest,
+    DocumentState
+  } from '@hcengineering/controlled-documents'
   import { Ref } from '@hcengineering/core'
-  import { ControlledDocument, ControlledDocumentState, DocumentState } from '@hcengineering/controlled-documents'
-  import { Employee } from '@hcengineering/contact'
   import { getClient } from '@hcengineering/presentation'
+  import { Scroller } from '@hcengineering/ui'
 
   import DocTeam from './DocTeam.svelte'
 
   export let controlledDoc: ControlledDocument
   export let editable: boolean = true
+  export let reviewRequest: DocumentReviewRequest | undefined
+  export let approvalRequest: DocumentApprovalRequest | undefined
 
-  $: canChangeCoAuthors =
-    editable && controlledDoc.state === DocumentState.Draft && controlledDoc.controlledState == null
-  $: canChangeReviewers =
-    editable && controlledDoc.state === DocumentState.Draft && controlledDoc.controlledState == null
-  $: canChangeApprovers =
-    editable &&
-    ((controlledDoc.state === DocumentState.Draft && controlledDoc.controlledState == null) ||
-      controlledDoc.controlledState === ControlledDocumentState.InReview ||
-      controlledDoc.controlledState === ControlledDocumentState.Reviewed)
+  $: controlledState = controlledDoc.controlledState ?? null
+
+  $: isEditableDraft = editable && controlledDoc.state === DocumentState.Draft
+
+  $: inCleanState = controlledState === null
+  $: inReview = controlledState === ControlledDocumentState.InReview && reviewRequest !== undefined
+  $: inApproval = controlledState === ControlledDocumentState.InApproval && approvalRequest !== undefined
+  $: isReviewed = controlledState === ControlledDocumentState.Reviewed
+
+  $: canChangeCoAuthors = isEditableDraft && inCleanState
+  $: canChangeReviewers = isEditableDraft && (inCleanState || inReview)
+  $: canChangeApprovers = isEditableDraft && (inCleanState || inApproval || inReview || isReviewed)
+
+  $: reviewers = (reviewRequest?.requested as Ref<Employee>[]) ?? controlledDoc.reviewers
+  $: approvers = (approvalRequest?.requested as Ref<Employee>[]) ?? controlledDoc.approvers
+  $: coAuthors = controlledDoc.coAuthors
 
   const client = getClient()
 
   async function handleUpdate ({
     detail
   }: {
-    detail: { type: 'reviewers' | 'approvers', users: Ref<Employee>[] }
+    detail: { type: 'reviewers' | 'approvers', users: Ref<Person>[] }
   }): Promise<void> {
     const { type, users } = detail
 
-    await client.update(controlledDoc, { [type]: users })
+    const request = detail.type === 'reviewers' ? reviewRequest : approvalRequest
+
+    const ops = client.apply()
+
+    if (request?._id !== undefined) {
+      const requested = request.requested?.slice() ?? []
+      const requestedSet = new Set<Ref<Person>>(requested)
+
+      const addedPersons = new Set<Ref<Person>>()
+      const removedPersons = new Set<Ref<Person>>(requested)
+
+      for (const u of users) {
+        if (requestedSet.has(u)) {
+          removedPersons.delete(u)
+        } else {
+          addedPersons.add(u)
+        }
+      }
+
+      const approved = request.approved?.slice() ?? []
+      const approvedDates = request.approvedDates?.slice() ?? []
+
+      for (const u of removedPersons) {
+        const idx = approved.indexOf(u)
+        if (idx === -1) continue
+        approved.splice(idx, 1)
+        approvedDates.splice(idx, 1)
+      }
+
+      const requiredApprovesCount = users.length
+
+      await ops.update(request, {
+        requested: users,
+        approved,
+        approvedDates,
+        requiredApprovesCount
+      })
+    }
+
+    await ops.update(controlledDoc, { [type]: users })
+    await ops.commit()
   }
 </script>
 
@@ -56,6 +111,9 @@
         {canChangeCoAuthors}
         {canChangeReviewers}
         {canChangeApprovers}
+        {reviewers}
+        {approvers}
+        {coAuthors}
         on:update={handleUpdate}
       />
     </div>