diff --git a/frontend/src/components/Activities/DataFields.vue b/frontend/src/components/Activities/DataFields.vue
index 5b97e80a..88119f80 100644
--- a/frontend/src/components/Activities/DataFields.vue
+++ b/frontend/src/components/Activities/DataFields.vue
@@ -31,7 +31,7 @@
   </div>
   <div
     v-if="document.get.loading"
-    class="flex flex-1 flex-col items-center justify-center gap-3 text-xl font-medium text-gray-500"
+    class="flex flex-1 flex-col items-center justify-center gap-3 text-xl font-medium text-ink-gray-6"
   >
     <LoadingIndicator class="h-6 w-6" />
     <span>{{ __('Loading...') }}</span>
diff --git a/frontend/src/components/Controls/Grid.vue b/frontend/src/components/Controls/Grid.vue
index 096b3542..cce8b245 100644
--- a/frontend/src/components/Controls/Grid.vue
+++ b/frontend/src/components/Controls/Grid.vue
@@ -393,7 +393,7 @@ const {
   getGridSettings,
 } = getMeta(props.doctype)
 getMeta(props.parentDoctype)
-const { getUser } = usersStore()
+const { users, getUser } = usersStore()
 
 const rows = defineModel()
 const parentDoc = defineModel('parent')
@@ -438,6 +438,14 @@ function getFieldObj(field) {
     }
   }
 
+  if (field.fieldtype === 'Link' && field.options === 'User') {
+    field.fieldtype = 'User'
+    field.link_filters = JSON.stringify({
+      ...(field.link_filters ? JSON.parse(field.link_filters) : {}),
+      name: ['in', users.data.crmUsers?.map((user) => user.name)],
+    })
+  }
+
   return {
     ...field,
     filters: field.link_filters && JSON.parse(field.link_filters),
diff --git a/frontend/src/components/FieldLayout/Field.vue b/frontend/src/components/FieldLayout/Field.vue
index 20a8656d..a70ff591 100644
--- a/frontend/src/components/FieldLayout/Field.vue
+++ b/frontend/src/components/FieldLayout/Field.vue
@@ -243,7 +243,7 @@ const isGridRow = inject('isGridRow')
 const { getFormattedPercent, getFormattedFloat, getFormattedCurrency } =
   getMeta(doctype)
 
-const { getUser } = usersStore()
+const { users, getUser } = usersStore()
 
 let triggerOnChange
 let parentDoc
@@ -278,6 +278,10 @@ const field = computed(() => {
 
   if (field.fieldtype === 'Link' && field.options === 'User') {
     field.fieldtype = 'User'
+    field.link_filters = JSON.stringify({
+      ...(field.link_filters ? JSON.parse(field.link_filters) : {}),
+      name: ['in', users.data.crmUsers?.map((user) => user.name)],
+    })
   }
 
   if (field.fieldtype === 'Link' && field.options !== 'User') {
diff --git a/frontend/src/components/Modals/AddExistingUserModal.vue b/frontend/src/components/Modals/AddExistingUserModal.vue
index db6b2d4d..d11c2f61 100644
--- a/frontend/src/components/Modals/AddExistingUserModal.vue
+++ b/frontend/src/components/Modals/AddExistingUserModal.vue
@@ -22,7 +22,7 @@
 
       <div class="p-2 group bg-surface-gray-2 hover:bg-surface-gray-3 rounded">
         <MultiSelectUserInput
-          v-if="users?.data?.crmUsers.length"
+          v-if="users?.data?.crmUsers?.length"
           class="flex-1"
           inputClass="!bg-surface-gray-2 hover:!bg-surface-gray-3 group-hover:!bg-surface-gray-3"
           :placeholder="__('john@doe.com')"
diff --git a/frontend/src/components/Modals/AssignmentModal.vue b/frontend/src/components/Modals/AssignmentModal.vue
index 05cea454..c6fc6dfd 100644
--- a/frontend/src/components/Modals/AssignmentModal.vue
+++ b/frontend/src/components/Modals/AssignmentModal.vue
@@ -33,6 +33,7 @@
         doctype="User"
         @change="(option) => addValue(option) && ($refs.input.value = '')"
         :placeholder="__('John Doe')"
+        :filters="{ name: ['in', users.data.crmUsers?.map((user) => user.name)] }"
         :hideMe="true"
       >
         <template #item-prefix="{ option }">
@@ -105,7 +106,7 @@ const oldAssignees = ref([])
 
 const error = ref('')
 
-const { getUser } = usersStore()
+const { users, getUser } = usersStore()
 
 const removeValue = (value) => {
   assignees.value = assignees.value.filter(
diff --git a/frontend/src/components/Modals/TaskModal.vue b/frontend/src/components/Modals/TaskModal.vue
index a172b51e..98c2cd71 100644
--- a/frontend/src/components/Modals/TaskModal.vue
+++ b/frontend/src/components/Modals/TaskModal.vue
@@ -1,23 +1,32 @@
 <template>
-  <Dialog v-model="show" :options="{
-    size: 'xl',
-    actions: [
-      {
-        label: editMode ? __('Update') : __('Create'),
-        variant: 'solid',
-        onClick: () => updateTask(),
-      },
-    ],
-  }">
+  <Dialog
+    v-model="show"
+    :options="{
+      size: 'xl',
+      actions: [
+        {
+          label: editMode ? __('Update') : __('Create'),
+          variant: 'solid',
+          onClick: () => updateTask(),
+        },
+      ],
+    }"
+  >
     <template #body-title>
       <div class="flex items-center gap-3">
         <h3 class="text-2xl font-semibold leading-6 text-ink-gray-9">
           {{ editMode ? __('Edit Task') : __('Create Task') }}
         </h3>
-        <Button v-if="task?.reference_docname" size="sm" :label="task.reference_doctype == 'CRM Deal'
-          ? __('Open Deal')
-          : __('Open Lead')
-          " @click="redirect()">
+        <Button
+          v-if="task?.reference_docname"
+          size="sm"
+          :label="
+            task.reference_doctype == 'CRM Deal'
+              ? __('Open Deal')
+              : __('Open Lead')
+          "
+          @click="redirect()"
+        >
           <template #suffix>
             <ArrowUpRightIcon class="w-4 h-4" />
           </template>
@@ -27,17 +36,29 @@
     <template #body-content>
       <div class="flex flex-col gap-4">
         <div>
-          <FormControl ref="title" :label="__('Title')" v-model="_task.title" :placeholder="__('Call with John Doe')"
-            required />
+          <FormControl
+            ref="title"
+            :label="__('Title')"
+            v-model="_task.title"
+            :placeholder="__('Call with John Doe')"
+            required
+          />
         </div>
         <div>
           <div class="mb-1.5 text-xs text-ink-gray-5">
             {{ __('Description') }}
           </div>
-          <TextEditor variant="outline" ref="description"
+          <TextEditor
+            variant="outline"
+            ref="description"
             editor-class="!prose-sm overflow-auto min-h-[180px] max-h-80 py-1.5 px-2 rounded border border-[--surface-gray-2] bg-surface-gray-2 placeholder-ink-gray-4 hover:border-outline-gray-modals hover:bg-surface-gray-3 hover:shadow-sm focus:bg-surface-white focus:border-outline-gray-4 focus:shadow-sm focus:ring-0 focus-visible:ring-2 focus-visible:ring-outline-gray-3 text-ink-gray-8 transition-colors"
-            :bubbleMenu="true" :content="_task.description" @change="(val) => (_task.description = val)" :placeholder="__('Took a call with John Doe and discussed the new project.')
-              " />
+            :bubbleMenu="true"
+            :content="_task.description"
+            @change="(val) => (_task.description = val)"
+            :placeholder="
+              __('Took a call with John Doe and discussed the new project.')
+            "
+          />
         </div>
         <div class="flex flex-wrap items-center gap-2">
           <Dropdown :options="taskStatusOptions(updateTaskStatus)">
@@ -47,24 +68,38 @@
               </template>
             </Button>
           </Dropdown>
-          <Link class="form-control" :value="getUser(_task.assigned_to).full_name" doctype="User"
-            @change="(option) => (_task.assigned_to = option)" :placeholder="__('John Doe')" :hideMe="true">
-          <template #prefix>
-            <UserAvatar class="mr-2 !h-4 !w-4" :user="_task.assigned_to" />
-          </template>
-          <template #item-prefix="{ option }">
-            <UserAvatar class="mr-2" :user="option.value" size="sm" />
-          </template>
-          <template #item-label="{ option }">
-            <Tooltip :text="option.value">
-              <div class="cursor-pointer text-ink-gray-9">
-                {{ getUser(option.value).full_name }}
-              </div>
-            </Tooltip>
-          </template>
+          <Link
+            class="form-control"
+            :value="getUser(_task.assigned_to).full_name"
+            doctype="User"
+            @change="(option) => (_task.assigned_to = option)"
+            :placeholder="__('John Doe')"
+            :filters="{
+              name: ['in', users.data.crmUsers?.map((user) => user.name)],
+            }"
+            :hideMe="true"
+          >
+            <template #prefix>
+              <UserAvatar class="mr-2 !h-4 !w-4" :user="_task.assigned_to" />
+            </template>
+            <template #item-prefix="{ option }">
+              <UserAvatar class="mr-2" :user="option.value" size="sm" />
+            </template>
+            <template #item-label="{ option }">
+              <Tooltip :text="option.value">
+                <div class="cursor-pointer text-ink-gray-9">
+                  {{ getUser(option.value).full_name }}
+                </div>
+              </Tooltip>
+            </template>
           </Link>
-          <DateTimePicker class="datepicker w-36" v-model="_task.due_date" :placeholder="__('01/04/2024 11:30 PM')"
-            :formatter="(date) => getFormat(date, '', true, true)" input-class="border-none" />
+          <DateTimePicker
+            class="datepicker w-36"
+            v-model="_task.due_date"
+            :placeholder="__('01/04/2024 11:30 PM')"
+            :formatter="(date) => getFormat(date, '', true, true)"
+            input-class="border-none"
+          />
           <Dropdown :options="taskPriorityOptions(updateTaskPriority)">
             <Button :label="_task.priority" class="justify-between w-full">
               <template #prefix>
@@ -114,7 +149,7 @@ const tasks = defineModel('reloadTasks')
 const emit = defineEmits(['updateTask', 'after'])
 
 const router = useRouter()
-const { getUser } = usersStore()
+const { users, getUser } = usersStore()
 const { updateOnboardingStep } = useOnboarding('frappecrm')
 
 const error = ref(null)
@@ -164,20 +199,24 @@ async function updateTask() {
       emit('after', d)
     }
   } else {
-    let d = await call('frappe.client.insert', {
-      doc: {
-        doctype: 'CRM Task',
-        reference_doctype: props.doctype,
-        reference_docname: props.doc || null,
-        ..._task.value,
+    let d = await call(
+      'frappe.client.insert',
+      {
+        doc: {
+          doctype: 'CRM Task',
+          reference_doctype: props.doctype,
+          reference_docname: props.doc || null,
+          ..._task.value,
+        },
       },
-    }, {
-      onError: (err) => {
-        if (err.error.exc_type == 'MandatoryError') {
-          error.value = "Title is mandatory"
-        }
-      }
-    })
+      {
+        onError: (err) => {
+          if (err.error.exc_type == 'MandatoryError') {
+            error.value = 'Title is mandatory'
+          }
+        },
+      },
+    )
     if (d.name) {
       updateOnboardingStep('create_first_task')
       capture('task_created')
diff --git a/frontend/src/components/SidePanelLayout.vue b/frontend/src/components/SidePanelLayout.vue
index aa42f49e..c8dcaaab 100644
--- a/frontend/src/components/SidePanelLayout.vue
+++ b/frontend/src/components/SidePanelLayout.vue
@@ -429,7 +429,7 @@ const emit = defineEmits(['afterFieldChange', 'reload'])
 const { getFormattedPercent, getFormattedFloat, getFormattedCurrency } =
   getMeta(props.doctype)
 
-const { isManager, getUser } = usersStore()
+const { users, isManager, getUser } = usersStore()
 
 const showSidePanelModal = ref(false)
 
@@ -471,8 +471,11 @@ function parsedField(field) {
   }
 
   if (field.fieldtype === 'Link' && field.options === 'User') {
-    field.options = field.options
     field.fieldtype = 'User'
+    field.link_filters = JSON.stringify({
+      ...(field.link_filters ? JSON.parse(field.link_filters) : {}),
+      name: ['in', users.data?.crmUsers?.map((user) => user.name)],
+    })
   }
 
   let _field = {
diff --git a/frontend/src/components/Telephony/TaskPanel.vue b/frontend/src/components/Telephony/TaskPanel.vue
index bf9641a5..28a9578c 100644
--- a/frontend/src/components/Telephony/TaskPanel.vue
+++ b/frontend/src/components/Telephony/TaskPanel.vue
@@ -45,6 +45,9 @@
         doctype="User"
         @change="(option) => (task.assigned_to = option)"
         :placeholder="__('John Doe')"
+        :filters="{
+          name: ['in', users.data?.crmUsers?.map((user) => user.name)],
+        }"
         :hideMe="true"
       >
         <template #prefix>
@@ -94,7 +97,7 @@ const props = defineProps({
   },
 })
 
-const { getUser } = usersStore()
+const { users, getUser } = usersStore()
 
 function updateTaskStatus(status) {
   props.task.status = status