diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json
index 8a57f6d64d..0ab3b3b1bf 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -922,7 +922,7 @@
    "label": "Primary Address", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "", 
+   "options": "customer_primary_address.complete_address", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -1447,7 +1447,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-01-31 16:44:52.191083", 
+ "modified": "2018-02-01 14:36:29.376438", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Customer", 
diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
index d0db648ba6..b0c04e601e 100644
--- a/erpnext/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py
@@ -54,7 +54,6 @@ class Customer(TransactionBase):
 		self.flags.old_lead = self.lead_name
 		validate_party_accounts(self)
 		self.validate_credit_limit_on_change()
-		self.fetch_primary_address_and_contact_detail()
 
 	def on_update(self):
 		self.validate_name_with_customer_group()
@@ -75,7 +74,7 @@ class Customer(TransactionBase):
 
 		if(self.customer_primary_address):
 			primary_address_doc = frappe.get_doc("Address",self.customer_primary_address)
-			self.primary_address = "<br>" + primary_address_doc.get_display()	
+			self.primary_address = primary_address_doc.complete_address
 
 	def create_primary_contact(self):
 		if not self.customer_primary_contact and not self.lead_name: