diff --git a/crm/fcrm/doctype/crm_deal/crm_deal.json b/crm/fcrm/doctype/crm_deal/crm_deal.json
index 96c5f22f..f544387d 100644
--- a/crm/fcrm/doctype/crm_deal/crm_deal.json
+++ b/crm/fcrm/doctype/crm_deal/crm_deal.json
@@ -257,7 +257,8 @@
   {
    "fieldname": "log_tab",
    "fieldtype": "Tab Break",
-   "label": "Log"
+   "label": "Log",
+   "read_only": 1
   },
   {
    "fieldname": "status_change_log",
@@ -268,7 +269,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-01-06 14:05:52.669699",
+ "modified": "2024-01-06 17:19:49.009903",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Deal",
diff --git a/frontend/src/components/Activities.vue b/frontend/src/components/Activities.vue
index c23b5f05..02b97c02 100644
--- a/frontend/src/components/Activities.vue
+++ b/frontend/src/components/Activities.vue
@@ -713,7 +713,6 @@ import { usersStore } from '@/stores/users'
 import { contactsStore } from '@/stores/contacts'
 import {
   Button,
-  FeatherIcon,
   Tooltip,
   Dropdown,
   TextEditor,
diff --git a/frontend/src/components/AttachmentItem.vue b/frontend/src/components/AttachmentItem.vue
index 529c1469..aa4dc2bd 100644
--- a/frontend/src/components/AttachmentItem.vue
+++ b/frontend/src/components/AttachmentItem.vue
@@ -37,7 +37,6 @@
 
 <script setup>
 import { ref } from 'vue'
-import { Button, Dialog } from 'frappe-ui'
 import mime from 'mime'
 import FileTypeIcon from '@/components/Icons/FileTypeIcon.vue'
 import FileImageIcon from '@/components/Icons/FileImageIcon.vue'
diff --git a/frontend/src/components/ColumnSettings.vue b/frontend/src/components/ColumnSettings.vue
index d32c6439..7d889b37 100644
--- a/frontend/src/components/ColumnSettings.vue
+++ b/frontend/src/components/ColumnSettings.vue
@@ -142,7 +142,6 @@ import NestedPopover from '@/components/NestedPopover.vue'
 import Autocomplete from '@/components/frappe-ui/Autocomplete.vue'
 import Draggable from 'vuedraggable'
 import { computed, defineModel, ref } from 'vue'
-import { FeatherIcon, FormControl } from 'frappe-ui'
 import { watchOnce } from '@vueuse/core'
 
 const props = defineProps({
diff --git a/frontend/src/components/Controls/Link.vue b/frontend/src/components/Controls/Link.vue
index 5eef3930..15d026a8 100644
--- a/frontend/src/components/Controls/Link.vue
+++ b/frontend/src/components/Controls/Link.vue
@@ -49,7 +49,7 @@
 <script setup>
 import Autocomplete from '@/components/frappe-ui/Autocomplete.vue'
 import { watchDebounced } from '@vueuse/core'
-import { createResource, FeatherIcon } from 'frappe-ui'
+import { createResource } from 'frappe-ui'
 import { useAttrs, computed, ref } from 'vue'
 
 const props = defineProps({
diff --git a/frontend/src/components/Controls/MultiselectInput.vue b/frontend/src/components/Controls/MultiselectInput.vue
index 2311f31f..ed998bf7 100644
--- a/frontend/src/components/Controls/MultiselectInput.vue
+++ b/frontend/src/components/Controls/MultiselectInput.vue
@@ -30,7 +30,6 @@
 </template>
 
 <script setup>
-import { Button, ErrorMessage, FeatherIcon, TextInput } from 'frappe-ui'
 import { ref, defineModel } from 'vue'
 
 const props = defineProps({
diff --git a/frontend/src/components/CustomActions.vue b/frontend/src/components/CustomActions.vue
index 7a674053..be99a6c3 100644
--- a/frontend/src/components/CustomActions.vue
+++ b/frontend/src/components/CustomActions.vue
@@ -19,7 +19,7 @@
 
 <script setup>
 import { computed } from 'vue'
-import { Dropdown, FeatherIcon } from 'frappe-ui'
+import { Dropdown } from 'frappe-ui'
 
 const props = defineProps({
   actions: {
diff --git a/frontend/src/components/DropdownItem.vue b/frontend/src/components/DropdownItem.vue
index 5460ff4b..4868d54a 100644
--- a/frontend/src/components/DropdownItem.vue
+++ b/frontend/src/components/DropdownItem.vue
@@ -18,8 +18,6 @@
   </button>
 </template>
 <script setup>
-import { FeatherIcon } from 'frappe-ui'
-
 const props = defineProps({
   value: {
     type: String,
diff --git a/frontend/src/components/EmailEditor.vue b/frontend/src/components/EmailEditor.vue
index f72359b6..b0292dd3 100644
--- a/frontend/src/components/EmailEditor.vue
+++ b/frontend/src/components/EmailEditor.vue
@@ -114,12 +114,7 @@
 import AttachmentIcon from '@/components/Icons/AttachmentIcon.vue'
 import AttachmentItem from '@/components/AttachmentItem.vue'
 import MultiselectInput from '@/components/Controls/MultiselectInput.vue'
-import {
-  TextEditorFixedMenu,
-  TextEditor,
-  FileUploader,
-  FeatherIcon,
-} from 'frappe-ui'
+import { TextEditorFixedMenu, TextEditor, FileUploader } from 'frappe-ui'
 import { validateEmail } from '@/utils'
 import { EditorContent } from '@tiptap/vue-3'
 import { ref, computed, defineModel } from 'vue'
diff --git a/frontend/src/components/Filter.vue b/frontend/src/components/Filter.vue
index 3a1ed370..b1b183b0 100644
--- a/frontend/src/components/Filter.vue
+++ b/frontend/src/components/Filter.vue
@@ -106,12 +106,7 @@
 import NestedPopover from '@/components/NestedPopover.vue'
 import FilterIcon from '@/components/Icons/FilterIcon.vue'
 import Link from '@/components/Controls/Link.vue'
-import {
-  FeatherIcon,
-  Autocomplete,
-  FormControl,
-  createResource,
-} from 'frappe-ui'
+import { FormControl, Autocomplete, createResource } from 'frappe-ui'
 import { h, defineModel, computed } from 'vue'
 
 const typeCheck = ['Check']
diff --git a/frontend/src/components/ListViews/CallLogsListView.vue b/frontend/src/components/ListViews/CallLogsListView.vue
index 4bbf2441..ee8f2753 100644
--- a/frontend/src/components/ListViews/CallLogsListView.vue
+++ b/frontend/src/components/ListViews/CallLogsListView.vue
@@ -72,9 +72,6 @@ import {
   ListRow,
   ListSelectBanner,
   ListRowItem,
-  FormControl,
-  FeatherIcon,
-  Badge,
 } from 'frappe-ui'
 
 const props = defineProps({
diff --git a/frontend/src/components/ListViews/DealsListView.vue b/frontend/src/components/ListViews/DealsListView.vue
index 05698535..c6bc906b 100644
--- a/frontend/src/components/ListViews/DealsListView.vue
+++ b/frontend/src/components/ListViews/DealsListView.vue
@@ -100,8 +100,6 @@ import {
   ListRow,
   ListRowItem,
   ListSelectBanner,
-  FormControl,
-  Badge,
 } from 'frappe-ui'
 
 const props = defineProps({
diff --git a/frontend/src/components/ListViews/LeadsListView.vue b/frontend/src/components/ListViews/LeadsListView.vue
index 1dc656cb..6e2465b4 100644
--- a/frontend/src/components/ListViews/LeadsListView.vue
+++ b/frontend/src/components/ListViews/LeadsListView.vue
@@ -109,8 +109,6 @@ import {
   ListRow,
   ListSelectBanner,
   ListRowItem,
-  FormControl,
-  Badge,
 } from 'frappe-ui'
 
 const props = defineProps({
diff --git a/frontend/src/components/ListViews/OrganizationsListView.vue b/frontend/src/components/ListViews/OrganizationsListView.vue
index 488438e6..0d48ab42 100644
--- a/frontend/src/components/ListViews/OrganizationsListView.vue
+++ b/frontend/src/components/ListViews/OrganizationsListView.vue
@@ -32,7 +32,10 @@
               />
             </div>
           </template>
-          <div v-if="['modified', 'creation'].includes(column.key)" class="truncate text-base">
+          <div
+            v-if="['modified', 'creation'].includes(column.key)"
+            class="truncate text-base"
+          >
             {{ item.timeAgo }}
           </div>
           <div v-else-if="column.type === 'Check'">
@@ -58,7 +61,6 @@ import {
   ListRow,
   ListSelectBanner,
   ListRowItem,
-  FormControl,
 } from 'frappe-ui'
 
 const props = defineProps({
diff --git a/frontend/src/components/Modals/AssignmentModal.vue b/frontend/src/components/Modals/AssignmentModal.vue
index f3eb7db6..c84b6588 100644
--- a/frontend/src/components/Modals/AssignmentModal.vue
+++ b/frontend/src/components/Modals/AssignmentModal.vue
@@ -71,7 +71,7 @@
 import UserAvatar from '@/components/UserAvatar.vue'
 import Link from '@/components/Controls/Link.vue'
 import { usersStore } from '@/stores/users'
-import { Dialog, Tooltip, FeatherIcon, call, ErrorMessage } from 'frappe-ui'
+import { Tooltip, call } from 'frappe-ui'
 import { defineModel, ref, computed } from 'vue'
 import { watchOnce } from '@vueuse/core'
 
diff --git a/frontend/src/components/Modals/ContactModal.vue b/frontend/src/components/Modals/ContactModal.vue
index ba3de768..80d91ba2 100644
--- a/frontend/src/components/Modals/ContactModal.vue
+++ b/frontend/src/components/Modals/ContactModal.vue
@@ -158,7 +158,7 @@ import EditIcon from '@/components/Icons/EditIcon.vue'
 import Link from '@/components/Controls/Link.vue'
 import Dropdown from '@/components/frappe-ui/Dropdown.vue'
 import { contactsStore } from '@/stores/contacts'
-import { FormControl, Dialog, call, FeatherIcon } from 'frappe-ui'
+import { call } from 'frappe-ui'
 import { ref, defineModel, nextTick, watch, computed, h } from 'vue'
 import { createToast } from '@/utils'
 import { useRouter } from 'vue-router'
diff --git a/frontend/src/components/Modals/NoteModal.vue b/frontend/src/components/Modals/NoteModal.vue
index 0c904eb3..ba03bd50 100644
--- a/frontend/src/components/Modals/NoteModal.vue
+++ b/frontend/src/components/Modals/NoteModal.vue
@@ -42,7 +42,7 @@
 </template>
 
 <script setup>
-import { TextInput, TextEditor, Dialog, call } from 'frappe-ui'
+import { TextEditor, call } from 'frappe-ui'
 import { ref, defineModel, nextTick, watch } from 'vue'
 
 const props = defineProps({
diff --git a/frontend/src/components/Modals/OrganizationModal.vue b/frontend/src/components/Modals/OrganizationModal.vue
index 0bfdab0f..8ebd0bf9 100644
--- a/frontend/src/components/Modals/OrganizationModal.vue
+++ b/frontend/src/components/Modals/OrganizationModal.vue
@@ -131,7 +131,7 @@ import OrganizationsIcon from '@/components/Icons/OrganizationsIcon.vue'
 import TerritoryIcon from '@/components/Icons/TerritoryIcon.vue'
 import Link from '@/components/Controls/Link.vue'
 import { organizationsStore } from '@/stores/organizations'
-import { FormControl, Dialog, call, FeatherIcon } from 'frappe-ui'
+import { call, FeatherIcon } from 'frappe-ui'
 import { ref, defineModel, nextTick, watch, computed, h } from 'vue'
 import { useRouter } from 'vue-router'
 
diff --git a/frontend/src/components/Modals/TaskModal.vue b/frontend/src/components/Modals/TaskModal.vue
index d2b397c4..e5439860 100644
--- a/frontend/src/components/Modals/TaskModal.vue
+++ b/frontend/src/components/Modals/TaskModal.vue
@@ -90,15 +90,7 @@ import UserAvatar from '@/components/UserAvatar.vue'
 import Link from '@/components/Controls/Link.vue'
 import { taskStatusOptions, taskPriorityOptions } from '@/utils'
 import { usersStore } from '@/stores/users'
-import {
-  TextInput,
-  TextEditor,
-  Dialog,
-  Dropdown,
-  Tooltip,
-  DatePicker,
-  call,
-} from 'frappe-ui'
+import { TextEditor, Dropdown, Tooltip, DatePicker, call } from 'frappe-ui'
 import { ref, defineModel, watch, nextTick } from 'vue'
 
 const props = defineProps({
diff --git a/frontend/src/components/Modals/ViewModal.vue b/frontend/src/components/Modals/ViewModal.vue
index ca9d5134..6a545c96 100644
--- a/frontend/src/components/Modals/ViewModal.vue
+++ b/frontend/src/components/Modals/ViewModal.vue
@@ -34,7 +34,7 @@
 </template>
 
 <script setup>
-import { Dialog, FormControl, call } from 'frappe-ui'
+import { call } from 'frappe-ui'
 import { ref, watch, defineModel, nextTick } from 'vue'
 
 const props = defineProps({
diff --git a/frontend/src/components/NewDeal.vue b/frontend/src/components/NewDeal.vue
index 26f49291..0dfe1138 100644
--- a/frontend/src/components/NewDeal.vue
+++ b/frontend/src/components/NewDeal.vue
@@ -70,7 +70,7 @@ import Link from '@/components/Controls/Link.vue'
 import OrganizationModal from '@/components/Modals/OrganizationModal.vue'
 import { usersStore } from '@/stores/users'
 import { statusesStore } from '@/stores/statuses'
-import { FormControl, Tooltip } from 'frappe-ui'
+import { Tooltip } from 'frappe-ui'
 import { computed, onMounted, ref } from 'vue'
 
 const { getUser } = usersStore()
diff --git a/frontend/src/components/NewLead.vue b/frontend/src/components/NewLead.vue
index 7b08bc71..4ba8d6aa 100644
--- a/frontend/src/components/NewLead.vue
+++ b/frontend/src/components/NewLead.vue
@@ -70,7 +70,7 @@ import OrganizationModal from '@/components/Modals/OrganizationModal.vue'
 import Link from '@/components/Controls/Link.vue'
 import { usersStore } from '@/stores/users'
 import { statusesStore } from '@/stores/statuses'
-import { FormControl, Tooltip } from 'frappe-ui'
+import { Tooltip } from 'frappe-ui'
 import { computed, onMounted, ref } from 'vue'
 
 const { getUser } = usersStore()
diff --git a/frontend/src/components/SLASection.vue b/frontend/src/components/SLASection.vue
index 664e094a..ba3acf3a 100644
--- a/frontend/src/components/SLASection.vue
+++ b/frontend/src/components/SLASection.vue
@@ -42,7 +42,7 @@
   </div>
 </template>
 <script setup>
-import { Dropdown, Badge, Tooltip, FeatherIcon } from 'frappe-ui'
+import { Dropdown, Tooltip } from 'frappe-ui'
 import { timeAgo, dateFormat, formatTime, dateTooltipFormat } from '@/utils'
 import { statusesStore } from '@/stores/statuses'
 import { computed, defineModel } from 'vue'
diff --git a/frontend/src/components/Section.vue b/frontend/src/components/Section.vue
index 20e4573e..ce920116 100644
--- a/frontend/src/components/Section.vue
+++ b/frontend/src/components/Section.vue
@@ -29,7 +29,6 @@
   </transition>
 </template>
 <script setup>
-import { FeatherIcon } from 'frappe-ui'
 import { ref } from 'vue'
 const props = defineProps({
   label: {
diff --git a/frontend/src/components/SectionFields.vue b/frontend/src/components/SectionFields.vue
index c6d504c2..d7f60210 100644
--- a/frontend/src/components/SectionFields.vue
+++ b/frontend/src/components/SectionFields.vue
@@ -103,7 +103,7 @@ import ArrowUpRightIcon from '@/components/Icons/ArrowUpRightIcon.vue'
 import Link from '@/components/Controls/Link.vue'
 import UserAvatar from '@/components/UserAvatar.vue'
 import { usersStore } from '@/stores/users'
-import { FormControl, Tooltip } from 'frappe-ui'
+import { Tooltip } from 'frappe-ui'
 import { defineModel } from 'vue'
 
 const props = defineProps({
diff --git a/frontend/src/components/SortBy.vue b/frontend/src/components/SortBy.vue
index 7655c258..9d1bc606 100644
--- a/frontend/src/components/SortBy.vue
+++ b/frontend/src/components/SortBy.vue
@@ -99,13 +99,7 @@ import NestedPopover from '@/components/NestedPopover.vue'
 import SortIcon from '@/components/Icons/SortIcon.vue'
 import DragIcon from '@/components/Icons/DragIcon.vue'
 import { useSortable } from '@vueuse/integrations/useSortable'
-import {
-  FeatherIcon,
-  Button,
-  Autocomplete,
-  FormControl,
-  createResource,
-} from 'frappe-ui'
+import { Autocomplete, createResource } from 'frappe-ui'
 import { computed, ref, nextTick } from 'vue'
 
 const props = defineProps({
diff --git a/frontend/src/components/UserDropdown.vue b/frontend/src/components/UserDropdown.vue
index 1e809b12..5745009c 100644
--- a/frontend/src/components/UserDropdown.vue
+++ b/frontend/src/components/UserDropdown.vue
@@ -46,7 +46,7 @@
 import CRMLogo from '@/components/Icons/CRMLogo.vue'
 import { sessionStore } from '@/stores/session'
 import { usersStore } from '@/stores/users'
-import { Dropdown, FeatherIcon } from 'frappe-ui'
+import { Dropdown } from 'frappe-ui'
 import { computed } from 'vue'
 
 const props = defineProps({
diff --git a/frontend/src/components/ViewControls.vue b/frontend/src/components/ViewControls.vue
index 4fee58ab..87b98901 100644
--- a/frontend/src/components/ViewControls.vue
+++ b/frontend/src/components/ViewControls.vue
@@ -77,7 +77,7 @@ import ColumnSettings from '@/components/ColumnSettings.vue'
 import { globalStore } from '@/stores/global'
 import { viewsStore } from '@/stores/views'
 import { useDebounceFn } from '@vueuse/core'
-import { createResource, FeatherIcon, Dropdown, call } from 'frappe-ui'
+import { createResource, Dropdown, call } from 'frappe-ui'
 import { computed, ref, defineModel, onMounted, watch, h } from 'vue'
 import { useRouter, useRoute } from 'vue-router'
 
diff --git a/frontend/src/main.js b/frontend/src/main.js
index ae8aae71..303b2283 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -17,6 +17,7 @@ import {
   Badge,
   setConfig,
   frappeRequest,
+  FeatherIcon,
 } from 'frappe-ui'
 import { createDialog } from './utils/dialogs'
 import socket from './socket'
@@ -32,6 +33,7 @@ let globalComponents = {
   Dialog,
   Alert,
   Badge,
+  FeatherIcon,
 }
 
 // create a pinia instance
diff --git a/frontend/src/pages/CallLog.vue b/frontend/src/pages/CallLog.vue
index 7c397e76..fd5215c8 100644
--- a/frontend/src/pages/CallLog.vue
+++ b/frontend/src/pages/CallLog.vue
@@ -143,14 +143,17 @@
 import LayoutHeader from '@/components/LayoutHeader.vue'
 import DurationIcon from '@/components/Icons/DurationIcon.vue'
 import NoteModal from '@/components/Modals/NoteModal.vue'
-import { dateFormat, timeAgo, dateTooltipFormat, secondsToDuration } from '@/utils'
+import {
+  dateFormat,
+  timeAgo,
+  dateTooltipFormat,
+  secondsToDuration,
+} from '@/utils'
 import {
   TextEditor,
   Avatar,
-  FeatherIcon,
   call,
   Tooltip,
-  Badge,
   createResource,
   Breadcrumbs,
 } from 'frappe-ui'
diff --git a/frontend/src/pages/Contact.vue b/frontend/src/pages/Contact.vue
index d3a12d45..2dfa6a0f 100644
--- a/frontend/src/pages/Contact.vue
+++ b/frontend/src/pages/Contact.vue
@@ -198,16 +198,13 @@
 
 <script setup>
 import {
-  FeatherIcon,
   Breadcrumbs,
   Avatar,
   FileUploader,
-  ErrorMessage,
   Tooltip,
   Tabs,
   call,
   createResource,
-  createListResource,
 } from 'frappe-ui'
 import Dropdown from '@/components/frappe-ui/Dropdown.vue'
 import LayoutHeader from '@/components/LayoutHeader.vue'
diff --git a/frontend/src/pages/Contacts.vue b/frontend/src/pages/Contacts.vue
index e931b13d..e8548ccf 100644
--- a/frontend/src/pages/Contacts.vue
+++ b/frontend/src/pages/Contacts.vue
@@ -38,7 +38,7 @@ import LayoutHeader from '@/components/LayoutHeader.vue'
 import ContactModal from '@/components/Modals/ContactModal.vue'
 import ContactsListView from '@/components/ListViews/ContactsListView.vue'
 import ViewControls from '@/components/ViewControls.vue'
-import { FeatherIcon, Breadcrumbs } from 'frappe-ui'
+import { Breadcrumbs } from 'frappe-ui'
 import { organizationsStore } from '@/stores/organizations.js'
 import { dateFormat, dateTooltipFormat, timeAgo } from '@/utils'
 import { ref, computed } from 'vue'
diff --git a/frontend/src/pages/Deal.vue b/frontend/src/pages/Deal.vue
index ffd0f416..25e4070e 100644
--- a/frontend/src/pages/Deal.vue
+++ b/frontend/src/pages/Deal.vue
@@ -300,14 +300,12 @@ import { organizationsStore } from '@/stores/organizations'
 import { statusesStore } from '@/stores/statuses'
 import {
   createResource,
-  FeatherIcon,
   Dropdown,
   Tooltip,
   Avatar,
   Tabs,
   Breadcrumbs,
   call,
-  Badge,
 } from 'frappe-ui'
 import { ref, computed, h } from 'vue'
 import { useRouter } from 'vue-router'
diff --git a/frontend/src/pages/Deals.vue b/frontend/src/pages/Deals.vue
index 33e7e2e7..77534cbf 100644
--- a/frontend/src/pages/Deals.vue
+++ b/frontend/src/pages/Deals.vue
@@ -61,13 +61,7 @@ import {
   formatNumberIntoCurrency,
   formatTime,
 } from '@/utils'
-import {
-  FeatherIcon,
-  Dialog,
-  Button,
-  createResource,
-  Breadcrumbs,
-} from 'frappe-ui'
+import { createResource, Breadcrumbs } from 'frappe-ui'
 import { useRouter } from 'vue-router'
 import { ref, computed, reactive } from 'vue'
 
diff --git a/frontend/src/pages/Lead.vue b/frontend/src/pages/Lead.vue
index 0f7f49eb..c00df248 100644
--- a/frontend/src/pages/Lead.vue
+++ b/frontend/src/pages/Lead.vue
@@ -32,7 +32,11 @@
           </Button>
         </template>
       </Dropdown>
-      <Button label="Convert to Deal" variant="solid" @click="convertToDeal" />
+      <Button
+        label="Convert to Deal"
+        variant="solid"
+        @click="showConvertToDealModal = true"
+      />
     </template>
   </LayoutHeader>
   <div v-if="lead?.data" class="flex h-full overflow-hidden">
@@ -158,23 +162,74 @@
       </div>
     </div>
   </div>
-  <OrganizationModal
-    v-model="showOrganizationModal"
-    :organization="_organization"
-    :options="{
-      redirect: false,
-      afterInsert: (doc) =>
-        updateField('organization', doc.name, () => {
-          organizations.reload()
-        }),
-    }"
-  />
   <AssignmentModal
     v-if="lead.data"
     :doc="lead.data"
     v-model="showAssignmentModal"
     v-model:assignees="lead.data._assignedTo"
   />
+  <Dialog
+    v-model="showConvertToDealModal"
+    :options="{
+      title: 'Convert to Deal',
+      size: 'xl',
+      actions: [
+        {
+          label: 'Convert',
+          variant: 'solid',
+          onClick: convertToDeal,
+        },
+      ],
+    }"
+  >
+    <template #body-content>
+      <div class="mb-4 flex items-center gap-2 text-gray-600">
+        <OrganizationsIcon class="h-4 w-4" />
+        <label class="block text-base"> Organization </label>
+      </div>
+      <div class="ml-6">
+        <div class="flex items-center justify-between text-base">
+          <div>Choose Existing</div>
+          <Switch v-model="existingOrganizationChecked" />
+        </div>
+        <Link
+          v-if="existingOrganizationChecked"
+          class="form-control mt-2.5"
+          variant="outline"
+          size="md"
+          :value="existingOrganization"
+          doctype="CRM Organization"
+          @change="(data) => (existingOrganization = data)"
+        />
+        <div v-else class="mt-2.5 text-base">
+          New organization will be created based on the data in details section
+        </div>
+      </div>
+
+      <div class="mb-4 mt-6 flex items-center gap-2 text-gray-600">
+        <ContactsIcon class="h-4 w-4" />
+        <label class="block text-base"> Contact </label>
+      </div>
+      <div class="ml-6">
+        <div class="flex items-center justify-between text-base">
+          <div>Choose Existing</div>
+          <Switch v-model="existingContactChecked" />
+        </div>
+        <Link
+          v-if="existingContactChecked"
+          class="form-control mt-2.5"
+          variant="outline"
+          size="md"
+          :value="existingContact"
+          doctype="Contact"
+          @change="(data) => (existingContact = data)"
+        />
+        <div v-else class="mt-2.5 text-base">
+          New contact will be created based on the person's details
+        </div>
+      </div>
+    </template>
+  </Dialog>
 </template>
 <script setup>
 import ActivityIcon from '@/components/Icons/ActivityIcon.vue'
@@ -185,11 +240,13 @@ import NoteIcon from '@/components/Icons/NoteIcon.vue'
 import IndicatorIcon from '@/components/Icons/IndicatorIcon.vue'
 import CameraIcon from '@/components/Icons/CameraIcon.vue'
 import LinkIcon from '@/components/Icons/LinkIcon.vue'
+import OrganizationsIcon from '@/components/Icons/OrganizationsIcon.vue'
+import ContactsIcon from '@/components/Icons/ContactsIcon.vue'
 import LayoutHeader from '@/components/LayoutHeader.vue'
 import Activities from '@/components/Activities.vue'
-import OrganizationModal from '@/components/Modals/OrganizationModal.vue'
 import AssignmentModal from '@/components/Modals/AssignmentModal.vue'
 import MultipleAvatar from '@/components/MultipleAvatar.vue'
+import Link from '@/components/Controls/Link.vue'
 import Section from '@/components/Section.vue'
 import SectionFields from '@/components/SectionFields.vue'
 import SLASection from '@/components/SLASection.vue'
@@ -207,12 +264,11 @@ import { statusesStore } from '@/stores/statuses'
 import {
   createResource,
   FileUploader,
-  ErrorMessage,
-  FeatherIcon,
   Dropdown,
   Tooltip,
   Avatar,
   Tabs,
+  Switch,
   Breadcrumbs,
   call,
 } from 'frappe-ui'
@@ -220,8 +276,8 @@ import { ref, computed } from 'vue'
 import { useRouter } from 'vue-router'
 
 const { $dialog } = globalStore()
-const { contacts } = contactsStore()
-const { organizations, getOrganization } = organizationsStore()
+const { getContactByName, contacts } = contactsStore()
+const { organizations } = organizationsStore()
 const { statusOptions, getLeadStatus } = statusesStore()
 const router = useRouter()
 
@@ -251,18 +307,12 @@ const lead = createResource({
 })
 
 const reload = ref(false)
-const showOrganizationModal = ref(false)
 const showAssignmentModal = ref(false)
-const _organization = ref({})
-
-const organization = computed(() => {
-  return lead.data?.organization && getOrganization(lead.data.organization)
-})
 
 function updateLead(fieldname, value, callback) {
   value = Array.isArray(fieldname) ? '' : value
 
-  if (validateRequired(fieldname, value)) return
+  if (!Array.isArray(fieldname) && validateRequired(fieldname, value)) return
 
   createResource({
     url: 'frappe.client.set_value',
@@ -354,16 +404,6 @@ const detailSections = computed(() => {
   return data.doctype_fields
 })
 
-async function convertToDeal() {
-  let deal = await call('crm.fcrm.doctype.crm_lead.crm_lead.convert_to_deal', {
-    lead: lead.data.name,
-  })
-  if (deal) {
-    await contacts.reload()
-    router.push({ name: 'Deal', params: { dealId: deal } })
-  }
-}
-
 function updateField(name, value, callback) {
   updateLead(name, value, () => {
     lead.data[name] = value
@@ -378,4 +418,82 @@ async function deleteLead(name) {
   })
   router.push({ name: 'Leads' })
 }
+
+// Convert to Deal
+const showConvertToDealModal = ref(false)
+const existingContactChecked = ref(false)
+const existingOrganizationChecked = ref(false)
+
+const existingContact = ref('')
+const existingOrganization = ref('')
+
+async function convertToDeal(updated) {
+  let valueUpdated = false
+
+  if (existingContactChecked.value && !existingContact.value) {
+    createToast({
+      title: 'Error',
+      text: 'Please select an existing contact',
+      icon: 'x',
+      iconClasses: 'text-red-600',
+    })
+    return
+  }
+
+  if (existingOrganizationChecked.value && !existingOrganization.value) {
+    createToast({
+      title: 'Error',
+      text: 'Please select an existing organization',
+      icon: 'x',
+      iconClasses: 'text-red-600',
+    })
+    return
+  }
+
+  if (existingContactChecked.value && existingContact.value) {
+    lead.data.salutation = getContactByName(existingContact.value).salutation
+    lead.data.first_name = getContactByName(existingContact.value).first_name
+    lead.data.last_name = getContactByName(existingContact.value).last_name
+    lead.data.email_id = getContactByName(existingContact.value).email_id
+    lead.data.mobile_no = getContactByName(existingContact.value).mobile_no
+    existingContactChecked.value = false
+    valueUpdated = true
+  }
+
+  if (existingOrganizationChecked.value && existingOrganization.value) {
+    lead.data.organization = existingOrganization.value
+    existingOrganizationChecked.value = false
+    valueUpdated = true
+  }
+
+  if (valueUpdated) {
+    updateLead(
+      {
+        salutation: lead.data.salutation,
+        first_name: lead.data.first_name,
+        last_name: lead.data.last_name,
+        email_id: lead.data.email_id,
+        mobile_no: lead.data.mobile_no,
+        organization: lead.data.organization,
+      },
+      '',
+      () => convertToDeal(true)
+    )
+    showConvertToDealModal.value = false
+  } else {
+    let deal = await call(
+      'crm.fcrm.doctype.crm_lead.crm_lead.convert_to_deal',
+      {
+        lead: lead.data.name,
+      }
+    )
+    if (deal) {
+      if (updated) {
+        await organizations.reload()
+        await contacts.reload()
+      }
+      router.push({ name: 'Deal', params: { dealId: deal } })
+    }
+  }
+}
 </script>
diff --git a/frontend/src/pages/Leads.vue b/frontend/src/pages/Leads.vue
index 2d7f3141..2dfbfe74 100644
--- a/frontend/src/pages/Leads.vue
+++ b/frontend/src/pages/Leads.vue
@@ -59,13 +59,7 @@ import { usersStore } from '@/stores/users'
 import { organizationsStore } from '@/stores/organizations'
 import { statusesStore } from '@/stores/statuses'
 import { dateFormat, dateTooltipFormat, timeAgo, formatTime } from '@/utils'
-import {
-  FeatherIcon,
-  Dialog,
-  Button,
-  createResource,
-  Breadcrumbs,
-} from 'frappe-ui'
+import { createResource, Breadcrumbs } from 'frappe-ui'
 import { useRouter } from 'vue-router'
 import { ref, computed, reactive } from 'vue'
 
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 05c39768..b8d3ea68 100644
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -78,7 +78,7 @@
 <script setup>
 import CRMLogo from '@/components/Icons/CRMLogo.vue';
 import { sessionStore } from '@/stores/session'
-import { FormControl, ErrorMessage, createResource } from 'frappe-ui'
+import { createResource } from 'frappe-ui'
 import { ref } from 'vue'
 
 const session = sessionStore()
diff --git a/frontend/src/pages/Notes.vue b/frontend/src/pages/Notes.vue
index 13875597..96652d63 100644
--- a/frontend/src/pages/Notes.vue
+++ b/frontend/src/pages/Notes.vue
@@ -86,8 +86,6 @@ import NoteIcon from '@/components/Icons/NoteIcon.vue'
 import NoteModal from '@/components/Modals/NoteModal.vue'
 import { timeAgo, dateFormat, dateTooltipFormat } from '@/utils'
 import {
-  FeatherIcon,
-  Button,
   createListResource,
   TextEditor,
   call,
diff --git a/frontend/src/pages/Organization.vue b/frontend/src/pages/Organization.vue
index 49e2e3a7..3d4ded0a 100644
--- a/frontend/src/pages/Organization.vue
+++ b/frontend/src/pages/Organization.vue
@@ -234,13 +234,10 @@
 <script setup>
 import {
   Breadcrumbs,
-  FeatherIcon,
   Avatar,
   FileUploader,
-  ErrorMessage,
   Dropdown,
   Tabs,
-  Badge,
   call,
   createListResource,
 } from 'frappe-ui'
diff --git a/frontend/src/pages/Organizations.vue b/frontend/src/pages/Organizations.vue
index cc545a37..c5057d10 100644
--- a/frontend/src/pages/Organizations.vue
+++ b/frontend/src/pages/Organizations.vue
@@ -41,7 +41,7 @@ import LayoutHeader from '@/components/LayoutHeader.vue'
 import OrganizationModal from '@/components/Modals/OrganizationModal.vue'
 import OrganizationsListView from '@/components/ListViews/OrganizationsListView.vue'
 import ViewControls from '@/components/ViewControls.vue'
-import { FeatherIcon, Breadcrumbs } from 'frappe-ui'
+import { Breadcrumbs } from 'frappe-ui'
 import {
   dateFormat,
   dateTooltipFormat,