diff --git a/admin-dev/themes/template/customers/view.tpl b/admin-dev/themes/template/customers/view.tpl
index e07a43dc3..ac665fcca 100644
--- a/admin-dev/themes/template/customers/view.tpl
+++ b/admin-dev/themes/template/customers/view.tpl
@@ -203,6 +203,7 @@
 				</table>
 			</div>
 		{/if}
+		<div class="clear">&nbsp;</</div>
 		{assign var=count_ko value=count($orders_ko)}
 		{if $count_ko}
 			<div style="float:left;margin-right:20px">
diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php
index 21d7eea15..532d66baf 100644
--- a/controllers/admin/AdminCustomersController.php
+++ b/controllers/admin/AdminCustomersController.php
@@ -369,6 +369,7 @@ class AdminCustomersControllerCore extends AdminController
 		if (!($customer = $this->loadObject()))
 			return;
 
+		$this->context->customer = $customer;
 		$gender = new Gender($customer->id_gender);
 		$gender_image = $gender->getImage();
 
@@ -433,6 +434,7 @@ class AdminCustomersControllerCore extends AdminController
 		for ($i = 0; $i < $total_carts; $i++)
 		{
 			$cart = new Cart((int)$carts[$i]['id_cart']);
+			$this->context->cart = $cart;
 			$summary = $cart->getSummaryDetails();
 			$currency = new Currency((int)$carts[$i]['id_currency']);
 			$carrier = new Carrier((int)$carts[$i]['id_carrier']);