diff --git a/controllers/front/AddressController.php b/controllers/front/AddressController.php
index d0e69df2d..382b90455 100644
--- a/controllers/front/AddressController.php
+++ b/controllers/front/AddressController.php
@@ -219,6 +219,12 @@ class AddressControllerCore extends FrontController
 			else // Update cart address
 				$this->context->cart->autosetProductAddress();
 
+            if (Tools::getValue('type') == 'invoice' && Configuration::get('PS_ORDER_PROCESS_TYPE'))
+            { 
+                $this->context->cart->id_address_invoice = (int)$address->id;
+                $this->context->cart->update();                
+            }
+            
 			if ($this->ajax)
 			{
 				$return = array(