diff --git a/support/doctype/communication/communication.js b/support/doctype/communication/communication.js
index f56b7a1..04e6c80 100644
--- a/support/doctype/communication/communication.js
+++ b/support/doctype/communication/communication.js
@@ -14,6 +14,9 @@
 			company_name like \"%%%s\") \
 			order by lead_name asc limit 50";
 	};
+	
+	cur_frm.fields_dict.customer.get_query = erpnext.utils.customer_query;
+	cur_frm.fields_dict.supplier.get_query = erpnext.utils.supplier_query;
 }
 
 cur_frm.cscript.refresh = function(doc, dt, dn) {
@@ -136,8 +139,4 @@
 cur_frm.cscript.hide_dialog = function() {
 	if(cur_frm.communication_list)
 		cur_frm.communication_list.run();
-}
-
-cur_frm.fields_dict.customer.get_query = erpnext.utils.customer_query;
-
-cur_frm.fields_dict.supplier.get_query = erpnext.utils.supplier_query;
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/utilities/doctype/address/address.js b/utilities/doctype/address/address.js
index 034806e..147f768 100644
--- a/utilities/doctype/address/address.js
+++ b/utilities/doctype/address/address.js
@@ -18,6 +18,9 @@
 	cur_frm.add_fetch('customer', 'customer_name', 'customer_name');
 	cur_frm.add_fetch('supplier', 'supplier_name', 'supplier_name');
 	
+	cur_frm.fields_dict.customer.get_query = erpnext.utils.customer_query;
+	cur_frm.fields_dict.supplier.get_query = erpnext.utils.supplier_query;
+	
 	var route = wn.get_route();
 	if(route[1]=='Supplier') {
 		var supplier = wn.container.page.frm.doc;
@@ -39,8 +42,4 @@
 cur_frm.cscript.hide_dialog = function() {
 	if(cur_frm.address_list)
 		cur_frm.address_list.run();
-}
-
-cur_frm.fields_dict.customer.get_query = erpnext.utils.customer_query;
-
-cur_frm.fields_dict.supplier.get_query = erpnext.utils.supplier_query;
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/utilities/doctype/contact/contact.js b/utilities/doctype/contact/contact.js
index 43bba1a..5bf9510 100644
--- a/utilities/doctype/contact/contact.js
+++ b/utilities/doctype/contact/contact.js
@@ -16,8 +16,11 @@
 
 //--------- ONLOAD -------------
 cur_frm.cscript.onload = function(doc, cdt, cdn) {	
-	if(doc.customer) cur_frm.add_fetch('customer', 'customer_name', 'customer_name');
-	if(doc.supplier) cur_frm.add_fetch('supplier', 'supplier_name', 'supplier_name');
+	cur_frm.add_fetch('customer', 'customer_name', 'customer_name');
+	cur_frm.add_fetch('supplier', 'supplier_name', 'supplier_name');
+	
+	cur_frm.fields_dict.customer.get_query = erpnext.utils.customer_query;
+	cur_frm.fields_dict.supplier.get_query = erpnext.utils.supplier_query;
 
 	var route = wn.get_route();
 	if(route[1]=='Supplier') {
@@ -40,8 +43,4 @@
 cur_frm.cscript.hide_dialog = function() {
 	if(cur_frm.contact_list)
 		cur_frm.contact_list.run();
-}
-
-cur_frm.fields_dict.customer.get_query = erpnext.utils.customer_query;
-
-cur_frm.fields_dict.supplier.get_query = erpnext.utils.supplier_query;
\ No newline at end of file
+}
\ No newline at end of file