diff --git a/frontend/src/components/Controls/Link.vue b/frontend/src/components/Controls/Link.vue
index 60e2a0db..b20ccde9 100644
--- a/frontend/src/components/Controls/Link.vue
+++ b/frontend/src/components/Controls/Link.vue
@@ -61,6 +61,10 @@ const props = defineProps({
     type: String,
     default: '',
   },
+  hideMe: {
+    type: Boolean,
+    default: false,
+  },
 })
 
 const emit = defineEmits(['update:modelValue', 'change'])
@@ -101,7 +105,7 @@ watchDebounced(
 
 const options = createResource({
   url: 'frappe.desk.search.search_link',
-  cache: [props.doctype, text.value],
+  cache: [props.doctype, text.value, props.hideMe],
   method: 'POST',
   params: {
     txt: text.value,
@@ -114,8 +118,7 @@ const options = createResource({
         value: option.value,
       }
     })
-
-    if (props.doctype == 'User') {
+    if (!props.hideMe && props.doctype == 'User') {
       allData.unshift({
         label: '@me',
         value: '@me',
diff --git a/frontend/src/components/SectionFields.vue b/frontend/src/components/SectionFields.vue
index d7f60210..6f0f7d7f 100644
--- a/frontend/src/components/SectionFields.vue
+++ b/frontend/src/components/SectionFields.vue
@@ -54,11 +54,13 @@
         <Link
           v-else-if="['lead_owner', 'deal_owner'].includes(field.name)"
           class="form-control"
-          :value="getUser(data[field.name]).full_name"
+          :value="data[field.name] && getUser(data[field.name]).full_name"
           doctype="User"
           @change="(data) => emit('update', field.name, data)"
+          :placeholder="'Select' + ' ' + field.label + '...'"
+          :hideMe="true"
         >
-          <template #prefix>
+          <template v-if="data[field.name]" #prefix>
             <UserAvatar class="mr-1.5" :user="data[field.name]" size="sm" />
           </template>
           <template #item-prefix="{ option }">