diff --git a/admin-dev/themes/default/template/controllers/orders/form.tpl b/admin-dev/themes/default/template/controllers/orders/form.tpl
index 2dda93aac..f65161713 100755
--- a/admin-dev/themes/default/template/controllers/orders/form.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/form.tpl
@@ -788,31 +788,27 @@
 				else
 					$('#send_email_feedback').removeClass('error').addClass('conf');
 				$('#send_email_feedback').html(res.result);
-				var x, address_del, address_inv;
+				var x;
 				for(x in res.addresses)
 				{
 					if (res.addresses[x].id_address == $('#id_address_delivery option:selected').val())
-					{
-						address_del = res.addresses[x].company+' '+res.addresses[x].firstname+' '+res.addresses[x].lastname+'<br />';
-						address_del += res.addresses[x].address1+'<br />';
-						address_del += res.addresses[x].address2+'<br />';
-						address_del += res.addresses[x].postcode+' '+res.addresses[x].city+' '+res.addresses[x].country;
-						$('#address_delivery_detail').html(address_del);
-					}
+						displayAddressDetail('address_delivery_detail', res.addresses[x]);
 					else if (res.addresses[x].id_address == $('#id_address_invoice option:selected').val())
-					{
-						address_inv = res.addresses[x].company+' '+res.addresses[x].firstname+' '+res.addresses[x].lastname+'<br />';
-						address_inv += res.addresses[x].address1+'<br />';
-						address_inv += res.addresses[x].address2+'<br />';
-						address_inv += res.addresses[x].postcode+' '+res.addresses[x].city+' '+res.addresses[x].country;
-						$('#address_invoice_detail').html(address_inv);
-					}
+						displayAddressDetail('address_invoice_detail', res.addresses[x]);
 				}
-
-
 			}
 		});
 	}
+
+	function displayAddressDetail(id, address)
+	{
+		var address_detail = address.company+' '+address.firstname+' '+address.lastname+'<br />';
+		address_detail += address.address1+'<br />';
+		address_detail += address.address2+'<br />';
+		address_detail += address.postcode+' '+address.city+' '+address.country;
+		$('#'+id).html(address_detail);
+	}
+
 </script>
 {if $show_toolbar}
 	<div class="toolbar-placeholder">