diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index 05beb6e..408adfb 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -13,6 +13,12 @@
 	}
 });
 
+frappe.ui.form.on_change("Purchase Order", "company", function(frm){
+		erpnext.utils.get_shipping_address(frm.doc)
+	}
+);
+
+
 erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend({
 	refresh: function(doc, cdt, cdn) {
 		var me = this;
diff --git a/erpnext/utilities/doctype/address/address.py b/erpnext/utilities/doctype/address/address.py
index 83ec775..5a6d1ef 100644
--- a/erpnext/utilities/doctype/address/address.py
+++ b/erpnext/utilities/doctype/address/address.py
@@ -144,7 +144,6 @@
 	else:
 		return name, template
 
-
 @frappe.whitelist()
 def get_shipping_address(company):
 	filters = {"company": company, "is_company_address":1}
@@ -156,5 +155,4 @@
 		frappe.throw(_("Please add addresses for the company"))
 	else:
 		name, address_template = get_address_templates(address_as_dict)
-
 		return address_as_dict.get("name"), frappe.render_template(address_template, address_as_dict)