diff --git a/controllers/front/OrderController.php b/controllers/front/OrderController.php
index 37b7ee071..6c59b32cf 100644
--- a/controllers/front/OrderController.php
+++ b/controllers/front/OrderController.php
@@ -196,8 +196,6 @@ class OrderControllerCore extends ParentOrderController
 				unset($this->context->cart->id_address_invoice);
 			Tools::redirect('index.php?controller=order&step=1');
 		}
-		else if ($this->step >= 3 && !$this->context->cart->delivery_option && !$isVirtualCart)
-			Tools::redirect('index.php?controller=order&step=2');
 	}
 
 	/*
diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php
index 6e8574603..33fdf1517 100644
--- a/controllers/front/OrderOpcController.php
+++ b/controllers/front/OrderOpcController.php
@@ -71,7 +71,8 @@ class OrderOpcControllerCore extends ParentOrderController
 									$return = array(
 										'summary' => $this->context->cart->getSummaryDetails(),
 										'HOOK_TOP_PAYMENT' => Hook::exec('paymentTop'),
-										'HOOK_PAYMENT' => $this->_getPaymentMethods()
+										'HOOK_PAYMENT' => $this->_getPaymentMethods(),
+										'carrier_data' => $this->_getCarrierList(),
 									);
 									die(Tools::jsonEncode($return));
 								}
@@ -236,7 +237,7 @@ class OrderOpcControllerCore extends ParentOrderController
 					}
 				}
 				else
-					throw new PrestashopException('Method is not defined'.Tools::isSubmit('method'));
+					throw new PrestashopException('Method is not defined');
 			}
 		}
 		elseif (Tools::isSubmit('ajax'))
diff --git a/themes/prestashop/js/order-opc.js b/themes/prestashop/js/order-opc.js
index a4b367a7d..11ce77a1f 100755
--- a/themes/prestashop/js/order-opc.js
+++ b/themes/prestashop/js/order-opc.js
@@ -169,6 +169,7 @@ function updateCarrierSelectionAndGift()
 				updatePaymentMethods(jsonData);
 				updateHookShoppingCart(jsonData.summary.HOOK_SHOPPING_CART);
 				updateHookShoppingCartExtra(jsonData.summary.HOOK_SHOPPING_CART_EXTRA);
+				updateCarrierList(json.carrier_data);
 				$('#opc_payment_methods-overlay').fadeOut('slow');
 				$('#opc_delivery_methods-overlay').fadeOut('slow');
 			}
diff --git a/themes/prestashop/order-carrier.tpl b/themes/prestashop/order-carrier.tpl
index 3d19aa5cb..9a64b5200 100644
--- a/themes/prestashop/order-carrier.tpl
+++ b/themes/prestashop/order-carrier.tpl
@@ -119,7 +119,7 @@
 			<div class="delivery_options">
 			{foreach $option_list as $key => $option}
 				<div class="delivery_option {if ($option@index % 2)}alternate_{/if}item">
-					<input class="delivery_option_radio" type="radio" name="delivery_option[{$id_address}]" {if $opc}onclick="updateCarrierSelectionAndGift();"{/if} id="delivery_option_{$id_address}_{$option@index}" value="{$key}" />
+					<input class="delivery_option_radio" type="radio" name="delivery_option[{$id_address}]" {if $opc}onclick="updateCarrierSelectionAndGift();"{/if} id="delivery_option_{$id_address}_{$option@index}" value="{$key}" {if $delivery_option[$id_address] == $key}selected="selected"{/if} />
 					<label for="delivery_option_{$id_address}_{$option@index}">
 						<table class="resume">
 							<tr>