diff --git a/erpnext/public/js/utils/contact_address_quick_entry.js b/erpnext/public/js/utils/contact_address_quick_entry.js
index 129b713c6f3..262d1c689a9 100644
--- a/erpnext/public/js/utils/contact_address_quick_entry.js
+++ b/erpnext/public/js/utils/contact_address_quick_entry.js
@@ -38,15 +38,27 @@ frappe.ui.form.ContactAddressQuickEntryForm = class ContactAddressQuickEntryForm
 				label: __("Primary Contact Details"),
 				collapsible: 1,
 			},
+			{
+				label: __("First Name"),
+				fieldname: "map_to_first_name",
+				fieldtype: "Data",
+				depends_on: "eval:doc.customer_type=='Company' || doc.supplier_type=='Company'",
+			},
+			{
+				label: __("Last Name"),
+				fieldname: "map_to_last_name",
+				fieldtype: "Data",
+				depends_on: "eval:doc.customer_type=='Company' || doc.supplier_type=='Company'",
+			},
+			{
+				fieldtype: "Column Break",
+			},
 			{
 				label: __("Email Id"),
 				fieldname: "email_address",
 				fieldtype: "Data",
 				options: "Email",
 			},
-			{
-				fieldtype: "Column Break",
-			},
 			{
 				label: __("Mobile Number"),
 				fieldname: "mobile_number",