diff --git a/erpnext/public/js/utils/contact_address_quick_entry.js b/erpnext/public/js/utils/contact_address_quick_entry.js
index 8c3baa2b3ceaf77bc3b3fcff1633473d430c6846..b42818b4e7fd1170d17e3077eeecba87123f22b0 100644
--- a/erpnext/public/js/utils/contact_address_quick_entry.js
+++ b/erpnext/public/js/utils/contact_address_quick_entry.js
@@ -106,13 +106,13 @@ frappe.ui.form.ContactAddressQuickEntryForm = class ContactAddressQuickEntryForm
 				label: __("First Name"),
 				fieldname: "map_to_first_name",
 				fieldtype: "Data",
-				depends_on: "eval:doc.customer_type=='Company'",
+				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'",
+				depends_on: "eval:doc.customer_type=='Company' || doc.supplier_type=='Company'",
 			},
 
 			{