diff --git a/crm/api/doc.py b/crm/api/doc.py
index b7b02511..b79de0c9 100644
--- a/crm/api/doc.py
+++ b/crm/api/doc.py
@@ -376,7 +376,7 @@ def get_type(field):
 		return "read_only"
 	return field.fieldtype.lower()
 
-def get_assigned_users(doctype, name):
+def get_assigned_users(doctype, name, default_assigned_to=None):
 	assigned_users = frappe.get_all(
 		"ToDo",
 		fields=["allocated_to"],
@@ -388,7 +388,12 @@ def get_assigned_users(doctype, name):
 		pluck="allocated_to",
 	)
 
-	return list(set(assigned_users))
+	users = list(set(assigned_users))
+
+	# if users is empty, add default_assigned_to
+	if not users and default_assigned_to:
+		users = [default_assigned_to]
+	return users
 
 
 @frappe.whitelist()
diff --git a/crm/fcrm/doctype/crm_deal/api.py b/crm/fcrm/doctype/crm_deal/api.py
index c05937bb..cb757b59 100644
--- a/crm/fcrm/doctype/crm_deal/api.py
+++ b/crm/fcrm/doctype/crm_deal/api.py
@@ -30,7 +30,7 @@ def get_deal(name):
 	deal["doctype_fields"], deal["all_fields"] = get_doctype_fields("CRM Deal", name) 
 	deal["doctype"] = "CRM Deal"
 	deal["_form_script"] = get_form_script('CRM Deal')
-	deal["_assign"] = get_assigned_users("CRM Deal", deal.name)
+	deal["_assign"] = get_assigned_users("CRM Deal", deal.name, deal.owner)
 	return deal
 
 @frappe.whitelist()
diff --git a/crm/fcrm/doctype/crm_lead/api.py b/crm/fcrm/doctype/crm_lead/api.py
index 74b6b7d1..b4dca9f7 100644
--- a/crm/fcrm/doctype/crm_lead/api.py
+++ b/crm/fcrm/doctype/crm_lead/api.py
@@ -18,5 +18,5 @@ def get_lead(name):
 	lead["doctype_fields"], lead["all_fields"] = get_doctype_fields("CRM Lead", name)
 	lead["doctype"] = "CRM Lead"
 	lead["_form_script"] = get_form_script('CRM Lead')
-	lead["_assign"] = get_assigned_users("CRM Lead", lead.name)
+	lead["_assign"] = get_assigned_users("CRM Lead", lead.name, lead.owner)
 	return lead