diff --git a/buying/doctype/supplier/supplier.js b/buying/doctype/supplier/supplier.js
index 5b1868313c0..3834bda92c5 100644
--- a/buying/doctype/supplier/supplier.js
+++ b/buying/doctype/supplier/supplier.js
@@ -55,7 +55,11 @@ cur_frm.cscript.make_address = function() {
 				address.supplier = cur_frm.doc.name;
 				address.supplier_name = cur_frm.doc.supplier_name;
 				address.address_title = cur_frm.doc.supplier_name;
-				address.address_type = "Office";
+
+				if(!(cur_frm.address_list.data && cur_frm.address_list.data.length)) {
+					address.address_type = "Office";
+				}
+				
 				wn.set_route("Form", "Address", address.name);
 			},
 			get_query: function() {
diff --git a/patches/december_2012/address_title.py b/patches/december_2012/address_title.py
index 4467d7af20b..554d5d4271b 100644
--- a/patches/december_2012/address_title.py
+++ b/patches/december_2012/address_title.py
@@ -1,6 +1,8 @@
 import webnotes
 
 def execute():
+	webnotes.reload_doc("utilities", "doctype", "address")
+
 	webnotes.conn.sql("""update tabAddress set address_title = customer_name where ifnull(customer_name,'')!=''""")
 	webnotes.conn.sql("""update tabAddress set address_title = supplier_name where ifnull(supplier_name,'')!=''""")
 	webnotes.conn.sql("""update tabAddress set address_title = sales_partner where ifnull(sales_partner,'')!=''""")	
diff --git a/patches/patch_list.py b/patches/patch_list.py
index 7ff4611e580..c9a4294bfb2 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -560,11 +560,11 @@ patch_list = [
 	},
 	{
 		'patch_module': 'patches.december_2012',
-<<<<<<< HEAD
 		'patch_file': 'address_title',
-=======
+	},
+	{
+		'patch_module': 'patches.december_2012',
 		'patch_file': 'delete_form16_print_format',
->>>>>>> a85b2e4ee349c544acb7a1949351e9a7c70f7b7c
 	},
 	{
 		'patch_module': 'patches.december_2012',
diff --git a/selling/doctype/customer/customer.js b/selling/doctype/customer/customer.js
index 7b5397e587a..403b83f5823 100644
--- a/selling/doctype/customer/customer.js
+++ b/selling/doctype/customer/customer.js
@@ -65,7 +65,11 @@ cur_frm.cscript.make_address = function() {
 				address.customer = cur_frm.doc.name;
 				address.customer_name = cur_frm.doc.customer_name;
 				address.address_title = cur_frm.doc.customer_name;
-				address.address_type = "Office";
+				
+				if(!(cur_frm.address_list.data && cur_frm.address_list.data.length)) {
+					address.address_type = "Office";
+				}
+
 				wn.set_route("Form", "Address", address.name);
 			},
 			get_query: function() {