diff --git a/crm/fcrm/doctype/crm_lead/crm_lead.py b/crm/fcrm/doctype/crm_lead/crm_lead.py
index 5704544c..362b4a10 100644
--- a/crm/fcrm/doctype/crm_lead/crm_lead.py
+++ b/crm/fcrm/doctype/crm_lead/crm_lead.py
@@ -15,9 +15,6 @@ class CRMLead(Document):
 		self.set_title()
 		self.validate_email()
 
-		if self.has_value_changed('converted') and self.converted:
-			self.create_contact()
-
 	def set_full_name(self):
 		if self.first_name:
 			self.lead_name = " ".join(
@@ -83,7 +80,7 @@ class CRMLead(Document):
 		contact.insert(ignore_permissions=True)
 		contact.reload()  # load changes by hooks on contact
 
-		return contact
+		return contact.name
 
 	def contact_exists(self):
 		email_exist = frappe.db.exists("Contact Email", {"email_id": self.email})
@@ -105,6 +102,19 @@ class CRMLead(Document):
 
 		return False
 
+	def create_deal(self, contact):
+		deal = frappe.new_doc("CRM Deal")
+		deal.update(
+			{
+				"lead": self.name,
+				"organization": self.organization,
+				"deal_owner": self.lead_owner,
+				"contacts": [{"contact": contact}],
+			}
+		)
+		deal.insert(ignore_permissions=True)
+		return deal.name
+
 	@staticmethod
 	def sort_options():
 		return [
@@ -118,4 +128,17 @@ class CRMLead(Document):
 			{ "label": 'Last Name', "value": 'last_name' },
 			{ "label": 'Email', "value": 'email' },
 			{ "label": 'Mobile no', "value": 'mobile_no' },
-		]
\ No newline at end of file
+		]
+
+@frappe.whitelist()
+def convert_to_deal(lead):
+	if not frappe.has_permission("CRM Lead", "write", lead):
+		frappe.throw(_("Not allowed to convert Lead to Deal"), frappe.PermissionError)
+
+	lead = frappe.get_cached_doc("CRM Lead", lead)
+	lead.status = "Qualified"
+	lead.converted = 1
+	contact = lead.create_contact()
+	deal = lead.create_deal(contact)
+	lead.save()
+	return deal
\ No newline at end of file
diff --git a/frontend/src/pages/Lead.vue b/frontend/src/pages/Lead.vue
index b2188222..3fc32b1b 100644
--- a/frontend/src/pages/Lead.vue
+++ b/frontend/src/pages/Lead.vue
@@ -379,7 +379,6 @@ function updateLead(fieldname, value, callback) {
     auto: true,
     onSuccess: () => {
       lead.reload()
-      contacts.reload()
       reload.value = true
       createToast({
         title: 'Lead updated',
@@ -555,26 +554,13 @@ const organization = computed(() => {
   return getOrganization(lead.data.organization)
 })
 
-function convertToDeal() {
-  updateLead({ status: 'Qualified', converted: 1 }, '', () => {
-    lead.data.status = 'Qualified'
-    lead.data.converted = 1
-    createDeal(lead.data)
+async function convertToDeal() {
+  let deal = await call('crm.fcrm.doctype.crm_lead.crm_lead.convert_to_deal', {
+    lead: lead.data.name,
   })
-}
-
-async function createDeal(lead) {
-  let d = await call('frappe.client.insert', {
-    doc: {
-      doctype: 'CRM Deal',
-      organization: lead.organization,
-      email: lead.email,
-      mobile_no: lead.mobile_no,
-      lead: lead.name,
-    },
-  })
-  if (d.name) {
-    router.push({ name: 'Deal', params: { dealId: d.name } })
+  if (deal) {
+    await contacts.reload()
+    router.push({ name: 'Deal', params: { dealId: deal } })
   }
 }