diff --git a/themes/default/mobile/js/opc.js b/themes/default/mobile/js/opc.js
index 6ef6a3a04..1f682df24 100644
--- a/themes/default/mobile/js/opc.js
+++ b/themes/default/mobile/js/opc.js
@@ -82,7 +82,7 @@ function initEvent()
 			data: 'ajax=true&method=updateTOSStatusAndGetPayments&checked=' + checked + '&token=' + static_token,
 			success: function(json)
 			{
-				window.location.href = orderOpcUrl;
+				window.location.href = orderOpcUrl+'#cgv_checkbox';
 			}
 		});
 	});
@@ -102,7 +102,7 @@ function updateCarrierSection(elm)
 	var gift = 0;
 	var giftMessage = '';
 
-	var delivery_option_radio = $('.delivery_option_radio');
+	var delivery_option_radio = $('.delivery_option_radio_carrier');
 	var delivery_option_params = '&';
 	$.each(delivery_option_radio, function(i) {
 		if ($(this).prop('checked'))
@@ -129,7 +129,7 @@ function updateCarrierSection(elm)
 		success: function(jsonData)
 		{
 			if (!elm.is('#gift'))
-				window.location.href = orderOpcUrl;
+				window.location.href = orderOpcUrl+'#delivery_choose';
 		}
 	});
 }
diff --git a/themes/default/mobile/order-opc-carrier.tpl b/themes/default/mobile/order-opc-carrier.tpl
index 57c79d2d8..08c938cf6 100644
--- a/themes/default/mobile/order-opc-carrier.tpl
+++ b/themes/default/mobile/order-opc-carrier.tpl
@@ -26,14 +26,14 @@
 {capture assign='page_title'}{l s='Shipping'}{/capture}
 {include file='./page-title.tpl'}
 
-<div data-role="content">
-	<h3 class="bg">{l s='Choose your delivery method'}</h3>
+<div data-role="content" id="delivery_choose">
+	<h3  class="bg">{l s='Choose your delivery method'}</h3>
 	<fieldset data-role="controlgroup">
 	{if isset($delivery_option_list)}
 		{foreach $delivery_option_list as $id_address => $option_list}
 			{foreach $option_list as $key => $option}
 				{foreach $option.carrier_list as $carrier}
-					<input type="radio" name="delivery_option[{$id_address}]" class="delivery_option_radio" id="opc_carrier_{$carrier.instance->id}" value="{$carrier.instance->id}" {if isset($delivery_option[$id_address]) && $delivery_option[$id_address] == $key}checked="checked"{/if} />
+					<input type="radio" name="delivery_option[{$id_address}]" class="delivery_option_radio delivery_option_radio_carrier" id="opc_carrier_{$carrier.instance->id}" value="{$carrier.instance->id}" {if isset($delivery_option[$id_address]) && $delivery_option[$id_address] == $key}checked="checked"{/if} />
 					<label for="opc_carrier_{$carrier.instance->id}">{$carrier.instance->name}</label>
 				{/foreach}
 			{/foreach}
@@ -56,7 +56,7 @@
 	</p>
 	
 	<h3 class="bg">{l s='Terms of service'}</h3>
-	<fieldset data-role="fieldcontain">
+	<fieldset data-role="fieldcontain" id="cgv_checkbox">
 		<input type="checkbox" value="1" id="cgv" name="cgv" {if $checkedTOS}checked="checked"{/if} />
 		<label for="cgv">{l s='I agree to the Terms of Service and will adhere to them unconditionally.'}</label>
 	</fieldset>