diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php
index 75408a1ca..ba5d7e3dc 100755
--- a/classes/controller/FrontController.php
+++ b/classes/controller/FrontController.php
@@ -175,7 +175,8 @@ class FrontControllerCore extends Controller
 			$this->context->customer->logout();
 
 			// Login information have changed, so we check if the cart rules still apply
-			CartRule::autoRemoveFromCart();
+			CartRule::autoRemoveFromCart($this->context);
+			CartRule::autoAddToCart($this->context);
 
 			Tools::redirect(isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : null);
 		}
diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php
index 3932ff66a..54dacfd31 100644
--- a/controllers/front/AuthController.php
+++ b/controllers/front/AuthController.php
@@ -323,7 +323,8 @@ class AuthControllerCore extends FrontController
 				Hook::exec('actionAuthentication');
 
 				// Login information have changed, so we check if the cart rules still apply
-				CartRule::autoRemoveFromCart();
+				CartRule::autoRemoveFromCart($this->context);
+				CartRule::autoAddToCart($this->context);
 
 				if (!$this->ajax)
 				{
diff --git a/controllers/front/ParentOrderController.php b/controllers/front/ParentOrderController.php
index 1002aac7c..bdd0355d4 100644
--- a/controllers/front/ParentOrderController.php
+++ b/controllers/front/ParentOrderController.php
@@ -242,7 +242,8 @@ class ParentOrderControllerCore extends FrontController
 			return false;
 
 		// Carrier has changed, so we check if the cart rules still apply
-		CartRule::autoRemoveFromCart();
+		CartRule::autoRemoveFromCart($this->context);
+		CartRule::autoAddToCart($this->context);
 		
 		return true;
 	}
@@ -373,7 +374,8 @@ class ParentOrderControllerCore extends FrontController
 				$this->context->cart->update();
 				
 				// Address has changed, so we check if the cart rules still apply
-				CartRule::autoRemoveFromCart();
+				CartRule::autoRemoveFromCart($this->context);
+				CartRule::autoAddToCart($this->context);
 			}
 
 			/* If delivery address is valid in cart, assign it to Smarty */
diff --git a/themes/default/js/cart-summary.js b/themes/default/js/cart-summary.js
index 3fe4a8255..ce46eb1be 100644
--- a/themes/default/js/cart-summary.js
+++ b/themes/default/js/cart-summary.js
@@ -578,6 +578,9 @@ function updateCartSummary(json)
 	}
 	else
 	{
+		if ($('.cart_discount').length == 0)
+			location.reload();
+
 		if (priceDisplayMethod != 0)
 			$('#total_discount').html(formatCurrency(json.total_discounts_tax_exc, currencyFormat, currencySign, currencyBlank));
 		else