diff --git a/crm/api/session.py b/crm/api/session.py
index ccaab666..758c53b6 100644
--- a/crm/api/session.py
+++ b/crm/api/session.py
@@ -39,7 +39,7 @@ def get_organizations():
 
 	organizations = frappe.qb.get_query(
 		"CRM Organization",
-		fields=['name', 'organization_logo', 'website'],
+		fields=['name', 'organization_name', 'organization_logo', 'website'],
 		order_by="name asc",
 		distinct=True,
 	).run(as_dict=1)
diff --git a/frontend/src/components/Modals/OrganizationModal.vue b/frontend/src/components/Modals/OrganizationModal.vue
index 66f395e1..7aa80fe8 100644
--- a/frontend/src/components/Modals/OrganizationModal.vue
+++ b/frontend/src/components/Modals/OrganizationModal.vue
@@ -8,7 +8,8 @@
         {
           label: editMode ? 'Update' : 'Create',
           variant: 'solid',
-          onClick: ({ close }) => updateOrganization(close),
+          onClick: ({ close }) =>
+            editMode ? updateOrganization(close) : callInsertDoc(close),
         },
       ],
     }"
@@ -20,7 +21,7 @@
           <TextInput
             ref="title"
             variant="outline"
-            v-model="_organization.name"
+            v-model="_organization.organization_name"
             placeholder="Add organization name"
           />
         </div>
@@ -47,6 +48,13 @@ const props = defineProps({
     type: Object,
     default: {},
   },
+  options: {
+    type: Object,
+    default: {
+      redirect: true,
+      afterInsert: () => {},
+    },
+  },
 })
 
 const show = defineModel()
@@ -73,19 +81,14 @@ async function updateOrganization(close) {
     return
   }
 
-  if (editMode.value) {
-    let name
-    if (nameChanged) {
-      name = await callRenameDoc()
-    }
-    if (otherFieldChanged) {
-      name = await callSetValue(values)
-    }
-    handleOrganizationUpdate(name)
-  } else {
-    await callInsertDoc()
+  let name
+  if (nameChanged) {
+    name = await callRenameDoc()
   }
-  close()
+  if (otherFieldChanged) {
+    name = await callSetValue(values)
+  }
+  handleOrganizationUpdate({ name }, close)
 }
 
 async function callRenameDoc() {
@@ -106,25 +109,27 @@ async function callSetValue(values) {
   return d.name
 }
 
-async function callInsertDoc() {
-  const d = await call('frappe.client.insert', {
+async function callInsertDoc(close) {
+  const doc = await call('frappe.client.insert', {
     doc: {
       doctype: 'CRM Organization',
-      organization_name: _organization.value.name,
+      organization_name: _organization.value.organization_name,
       website: _organization.value.website,
     },
   })
-  d.name && handleOrganizationUpdate()
+  doc.name && handleOrganizationUpdate(doc, close)
 }
 
-function handleOrganizationUpdate(name) {
-  organizations.value.reload()
-  if (name) {
+function handleOrganizationUpdate(doc, close) {
+  organizations.value?.reload()
+  if (doc.name && props.options.redirect) {
     router.push({
       name: 'Organization',
-      params: { organizationId: name },
+      params: { organizationId: doc.name },
     })
   }
+  close && close()
+  props.options.afterInsert && props.options.afterInsert(doc)
 }
 
 watch(
diff --git a/frontend/src/pages/Lead.vue b/frontend/src/pages/Lead.vue
index 69c0a68e..d8759212 100644
--- a/frontend/src/pages/Lead.vue
+++ b/frontend/src/pages/Lead.vue
@@ -8,7 +8,7 @@
         type="autocomplete"
         :options="activeAgents"
         :value="getUser(lead.data.lead_owner).full_name"
-        @change="(option) => updateAssignedAgent(option.email)"
+        @change="(option) => updateField('lead_owner', option.email)"
         placeholder="Lead owner"
       >
         <template #prefix>
@@ -197,21 +197,37 @@
                         "
                         :debounce="500"
                       />
-                      <FormControl
+                      <Autocomplete
                         v-else-if="field.type === 'link'"
-                        type="autocomplete"
                         :value="lead.data[field.name]"
                         :options="field.options"
                         @change="(e) => field.change(e)"
                         :placeholder="field.placeholder"
                         class="form-control"
-                      />
+                      >
+                        <template #footer="{ value, close }">
+                          <div>
+                            <Button
+                              variant="ghost"
+                              class="w-full !justify-start"
+                              label="Create one"
+                              @click="field.create(value, close)"
+                            >
+                              <template #prefix>
+                                <FeatherIcon name="plus" class="h-4" />
+                              </template>
+                            </Button>
+                          </div>
+                        </template>
+                      </Autocomplete>
                       <FormControl
                         v-else-if="field.type === 'user'"
                         type="autocomplete"
                         :options="activeAgents"
                         :value="getUser(lead.data[field.name]).full_name"
-                        @change="(option) => updateAssignedAgent(option.email)"
+                        @change="
+                          (option) => updateField('lead_owner', option.email)
+                        "
                         class="form-control"
                         :placeholder="field.placeholder"
                       >
@@ -305,6 +321,14 @@
       </div>
     </div>
   </div>
+  <OrganizationModal
+    v-model="showOrganizationModal"
+    :organization="_organization"
+    :options="{
+      redirect: false,
+      afterInsert: (doc) => updateField('organiation', doc.name),
+    }"
+  />
 </template>
 <script setup>
 import ActivityIcon from '@/components/Icons/ActivityIcon.vue'
@@ -320,6 +344,8 @@ import LayoutHeader from '@/components/LayoutHeader.vue'
 import Toggler from '@/components/Toggler.vue'
 import Activities from '@/components/Activities.vue'
 import UserAvatar from '@/components/UserAvatar.vue'
+import OrganizationModal from '@/components/Modals/OrganizationModal.vue'
+import Autocomplete from '@/components/frappe-ui/Autocomplete.vue'
 import {
   leadStatuses,
   statusDropdownOptions,
@@ -366,6 +392,8 @@ const lead = createResource({
 })
 
 const reload = ref(false)
+const showOrganizationModal = ref(false)
+const _organization = ref({})
 
 function updateLead(fieldname, value) {
   createResource({
@@ -455,9 +483,11 @@ const detailSections = computed(() => {
           name: 'organization',
           placeholder: 'Select organization',
           options: getOrganizationOptions(),
-          change: (data) => {
-            lead.data.organization = data.value
-            updateLead('organization', data.value)
+          change: (data) => data && updateField('organization', data.value),
+          create: (value, close) => {
+            _organization.value.organization_name = value
+            showOrganizationModal.value = true
+            close()
           },
           link: () => {
             router.push({
@@ -587,9 +617,9 @@ async function createDeal(lead) {
   }
 }
 
-function updateAssignedAgent(email) {
-  lead.data.lead_owner = email
-  updateLead('lead_owner', email)
+function updateField(name, value) {
+  lead.data[name] = value
+  updateLead(name, value)
 }
 </script>