diff --git a/erpnext/support/doctype/issue/issue.js b/erpnext/support/doctype/issue/issue.js
index 27bb46986bd..03e1aa4f878 100644
--- a/erpnext/support/doctype/issue/issue.js
+++ b/erpnext/support/doctype/issue/issue.js
@@ -3,13 +3,13 @@ frappe.ui.form.on("Issue", {
 		frm.email_field = "raised_by";
 	},
 
-	refresh: function(frm) {
+	refresh: function (frm) {
 		frm.add_custom_button(__("Task"), function () {
 			frappe.set_route("List", "Task", { "issue": frm.doc.name });
 		}, __("View"));
 
-		if(frm.doc.status!=="Closed") {
-			frm.add_custom_button(__("Close"), function() {
+		if (frm.doc.status !== "Closed") {
+			frm.add_custom_button(__("Close"), function () {
 				frm.set_value("status", "Closed");
 				frm.save();
 			});
@@ -21,7 +21,7 @@ frappe.ui.form.on("Issue", {
 				});
 			}, __("Make"));
 		} else {
-			frm.add_custom_button(__("Reopen"), function() {
+			frm.add_custom_button(__("Reopen"), function () {
 				frm.set_value("status", "Open");
 				frm.save();
 			});
diff --git a/erpnext/support/doctype/issue/issue.py b/erpnext/support/doctype/issue/issue.py
index 7e13947ee94..de3d144a7ef 100644
--- a/erpnext/support/doctype/issue/issue.py
+++ b/erpnext/support/doctype/issue/issue.py
@@ -33,7 +33,7 @@ class Issue(Document):
 			clear(self.doctype, self.name)
 
 	def on_update(self):
-		# create the communication email and remove the description
+		# Add a communication in the issue timeline
 		if self.flags.create_communication and self.via_customer_portal:
 			self.create_communication()
 			self.flags.communication_created = None
@@ -183,14 +183,8 @@ def update_issue(contact, method):
 
 @frappe.whitelist()
 def make_task(source_name, target_doc=None):
-	def set_missing_values(source, target):
-		if not target.project:
-			target.project = frappe.db.get_value("Project", {"customer": source.customer})
-
-	doclist = get_mapped_doc("Issue", source_name, {
+	return get_mapped_doc("Issue", source_name, {
 		"Issue": {
 			"doctype": "Task"
 		}
-	}, target_doc, set_missing_values)
-
-	return doclist
+	}, target_doc)