diff --git a/crm/fcrm/doctype/crm_deal/api.py b/crm/fcrm/doctype/crm_deal/api.py
index 5eaf2899..dd5d76df 100644
--- a/crm/fcrm/doctype/crm_deal/api.py
+++ b/crm/fcrm/doctype/crm_deal/api.py
@@ -13,7 +13,6 @@ def get_deal(name):
 
 	deal["fields_meta"] = get_fields_meta("CRM Deal")
 	deal["_form_script"] = get_form_script("CRM Deal")
-	deal["_assign"] = get_assigned_users("CRM Deal", deal.name)
 	return deal
 
 
diff --git a/crm/fcrm/doctype/crm_lead/api.py b/crm/fcrm/doctype/crm_lead/api.py
index 77e4fc58..e826e888 100644
--- a/crm/fcrm/doctype/crm_lead/api.py
+++ b/crm/fcrm/doctype/crm_lead/api.py
@@ -13,5 +13,4 @@ def get_lead(name):
 
 	lead["fields_meta"] = get_fields_meta("CRM Lead")
 	lead["_form_script"] = get_form_script("CRM Lead")
-	lead["_assign"] = get_assigned_users("CRM Lead", lead.name)
 	return lead
diff --git a/frontend/src/pages/Deal.vue b/frontend/src/pages/Deal.vue
index dfc6b5c9..d9b29299 100644
--- a/frontend/src/pages/Deal.vue
+++ b/frontend/src/pages/Deal.vue
@@ -334,12 +334,7 @@ import Section from '@/components/Section.vue'
 import SidePanelLayout from '@/components/SidePanelLayout.vue'
 import SLASection from '@/components/SLASection.vue'
 import CustomActions from '@/components/CustomActions.vue'
-import {
-  openWebsite,
-  setupAssignees,
-  setupCustomizations,
-  copyToClipboard,
-} from '@/utils'
+import { openWebsite, setupCustomizations, copyToClipboard } from '@/utils'
 import { getView } from '@/utils/view'
 import { getSettings } from '@/stores/settings'
 import { globalStore } from '@/stores/global'
@@ -399,7 +394,6 @@ const deal = createResource({
       organization.fetch()
     }
 
-    setupAssignees(deal)
     setupCustomizations(deal, {
       doc: data,
       $dialog,
@@ -727,8 +721,8 @@ function openEmailBox() {
 
 const { assignees, document } = useDocument('CRM Deal', props.dealId)
 
-function reloadAssignees(changes) {
-  if (changes?.hasOwnProperty('lead_owner')) {
+function reloadAssignees(data) {
+  if (data?.hasOwnProperty('deal_owner')) {
     assignees.reload()
   }
 }
diff --git a/frontend/src/pages/Lead.vue b/frontend/src/pages/Lead.vue
index d4ca8ef4..a13ec2a2 100644
--- a/frontend/src/pages/Lead.vue
+++ b/frontend/src/pages/Lead.vue
@@ -337,12 +337,7 @@ import SidePanelLayout from '@/components/SidePanelLayout.vue'
 import FieldLayout from '@/components/FieldLayout/FieldLayout.vue'
 import SLASection from '@/components/SLASection.vue'
 import CustomActions from '@/components/CustomActions.vue'
-import {
-  openWebsite,
-  setupAssignees,
-  setupCustomizations,
-  copyToClipboard,
-} from '@/utils'
+import { openWebsite, setupCustomizations, copyToClipboard } from '@/utils'
 import { showQuickEntryModal, quickEntryProps } from '@/composables/modals'
 import { getView } from '@/utils/view'
 import { getSettings } from '@/stores/settings'
@@ -405,7 +400,6 @@ const lead = createResource({
   onSuccess: (data) => {
     errorTitle.value = ''
     errorMessage.value = ''
-    setupAssignees(lead)
     setupCustomizations(lead, {
       doc: data,
       $dialog,
@@ -717,8 +711,8 @@ function openQuickEntryModal() {
   showConvertToDealModal.value = false
 }
 
-function reloadAssignees(changes) {
-  if (changes?.hasOwnProperty('lead_owner')) {
+function reloadAssignees(data) {
+  if (data?.hasOwnProperty('lead_owner')) {
     assignees.reload()
   }
 }
diff --git a/frontend/src/pages/MobileDeal.vue b/frontend/src/pages/MobileDeal.vue
index 44dd6207..9a1b91f9 100644
--- a/frontend/src/pages/MobileDeal.vue
+++ b/frontend/src/pages/MobileDeal.vue
@@ -36,8 +36,8 @@
     class="flex h-12 items-center justify-between gap-2 border-b px-3 py-2.5"
   >
     <AssignTo
-      v-model="deal.data._assignedTo"
-      :data="deal.data"
+      v-model="assignees.data"
+      :data="document.doc"
       doctype="CRM Deal"
     />
     <div class="flex items-center gap-2">
@@ -66,6 +66,7 @@
               doctype="CRM Deal"
               :docname="deal.data.name"
               @reload="sections.reload"
+              @afterFieldChange="reloadAssignees"
             >
               <template #actions="{ section }">
                 <div v-if="section.name == 'contacts_section'" class="pr-2">
@@ -258,12 +259,13 @@ import Link from '@/components/Controls/Link.vue'
 import SidePanelLayout from '@/components/SidePanelLayout.vue'
 import SLASection from '@/components/SLASection.vue'
 import CustomActions from '@/components/CustomActions.vue'
-import { setupAssignees, setupCustomizations } from '@/utils'
+import { setupCustomizations } from '@/utils'
 import { getView } from '@/utils/view'
 import { getSettings } from '@/stores/settings'
 import { globalStore } from '@/stores/global'
 import { statusesStore } from '@/stores/statuses'
 import { getMeta } from '@/stores/meta'
+import { useDocument } from '@/data/document'
 import {
   whatsappEnabled,
   callEnabled,
@@ -311,7 +313,6 @@ const deal = createResource({
       organization.fetch()
     }
 
-    setupAssignees(deal)
     setupCustomizations(deal, {
       doc: data,
       $dialog,
@@ -605,4 +606,12 @@ async function deleteDeal(name) {
   })
   router.push({ name: 'Deals' })
 }
+
+const { assignees, document } = useDocument('CRM Deal', props.dealId)
+
+function reloadAssignees(data) {
+  if (data?.hasOwnProperty('deal_owner')) {
+    assignees.reload()
+  }
+}
 </script>
diff --git a/frontend/src/pages/MobileLead.vue b/frontend/src/pages/MobileLead.vue
index a103560c..3d12c970 100644
--- a/frontend/src/pages/MobileLead.vue
+++ b/frontend/src/pages/MobileLead.vue
@@ -36,8 +36,8 @@
     class="flex h-12 items-center justify-between gap-2 border-b px-3 py-2.5"
   >
     <AssignTo
-      v-model="lead.data._assignedTo"
-      :data="lead.data"
+      v-model="assignees.data"
+      :data="document.doc"
       doctype="CRM Lead"
     />
     <div class="flex items-center gap-2">
@@ -71,6 +71,7 @@
               doctype="CRM Lead"
               :docname="lead.data.name"
               @reload="sections.reload"
+              @afterFieldChange="reloadAssignees"
             />
           </div>
         </div>
@@ -173,12 +174,13 @@ import Link from '@/components/Controls/Link.vue'
 import SidePanelLayout from '@/components/SidePanelLayout.vue'
 import SLASection from '@/components/SLASection.vue'
 import CustomActions from '@/components/CustomActions.vue'
-import { setupAssignees, setupCustomizations } from '@/utils'
+import { setupCustomizations } from '@/utils'
 import { getView } from '@/utils/view'
 import { getSettings } from '@/stores/settings'
 import { globalStore } from '@/stores/global'
 import { statusesStore } from '@/stores/statuses'
 import { getMeta } from '@/stores/meta'
+import { useDocument } from '@/data/document'
 import {
   whatsappEnabled,
   callEnabled,
@@ -220,7 +222,6 @@ const lead = createResource({
   params: { name: props.leadId },
   cache: ['lead', props.leadId],
   onSuccess: (data) => {
-    setupAssignees(lead)
     setupCustomizations(lead, {
       doc: data,
       $dialog,
@@ -454,4 +455,12 @@ async function convertToDeal() {
     router.push({ name: 'Deal', params: { dealId: deal } })
   }
 }
+
+const { assignees, document } = useDocument('CRM Lead', props.leadId)
+
+function reloadAssignees(data) {
+  if (data?.hasOwnProperty('lead_owner')) {
+    assignees.reload()
+  }
+}
 </script>
diff --git a/frontend/src/utils/index.js b/frontend/src/utils/index.js
index bf47bffd..82911a00 100644
--- a/frontend/src/utils/index.js
+++ b/frontend/src/utils/index.js
@@ -211,16 +211,6 @@ export function validateEmail(email) {
   return regExp.test(email)
 }
 
-export function setupAssignees(doc) {
-  let { getUser } = usersStore()
-  let assignees = doc.data?._assign || []
-  doc.data._assignedTo = assignees.map((user) => ({
-    name: user,
-    image: getUser(user).user_image,
-    label: getUser(user).full_name,
-  }))
-}
-
 export function parseAssignees(assignees) {
   let { getUser } = usersStore()
   return assignees.map((user) => ({