diff --git a/templates/default/order-delivery.html b/templates/default/order-delivery.html
index 4451f538d..fc2110e06 100644
--- a/templates/default/order-delivery.html
+++ b/templates/default/order-delivery.html
@@ -31,6 +31,7 @@
             </div>
 
             {form name="thelia.order.delivery"}
+            {assign var="isPost" value="{$smarty.post|count}"}
             <form id="form-cart-delivery" action="{url path="/order/delivery"}" method="post" role="form" {form_enctype form=$form}>
 
                 {form_hidden_fields form=$form}
@@ -42,7 +43,7 @@
                 <div id="delivery-address" class="panel">
                     <div class="panel-heading clearfix">
                         <a href="{url path="/address/create"}" class="btn btn-add-address">{intl l="Add a new address"}</a>
-                        {intl l="Chose your delivery address"}
+                        {intl l="Choose your delivery address"}
                         {if $error}
                             <span class="help-block"><span class="icon-remove"></span> {$message}</span>
                         {/if}
@@ -50,15 +51,19 @@
                     <div class="panel-body">
                         <table class="table table-address" role="presentation" summary="Address Books">
                             <tbody>
-
                             {loop type="address" name="customer.addresses" customer="current"}
-
-
+                            {if $isPost}
+                                {if $value == $ID}
+                                    {assign var="isDeliveryAddressChecked" value="true"}
+                                {/if}
+                            {elseif $DEFAULT}
+                                {assign var="isDeliveryAddressChecked" value="true"}
+                            {/if}
                             <tr>
                                 <th>
                                     <div class="radio">
                                         <label for="delivery-address_{$ID}">
-                                            <input type="radio" name="{$name}" value="{$ID}" {if $value == $ID}checked="checked"{/if} id="delivery-address_{$ID}">
+                                            <input type="radio" name="{$name}" value="{$ID}"{if isDeliveryAddressChecked } checked="checked"{/if} id="delivery-address_{$ID}">
                                             {$LABEL|default:"{intl l='Address %nb' nb={$LOOP_COUNT}}"}
                                         </label>
                                     </div>
@@ -124,8 +129,15 @@
                         {loop type="delivery" name="deliveries" force_return="true"}
                         <div class="radio">
                             {form_field form=$form field='delivery-module'}
+                                {if $isPost}
+                                    {if $value == $ID}
+                                        {assign var="isDeliveryMethodChecked" value="true"}
+                                    {/if}
+                                {elseif $LOOP_COUNT == 1}
+                                    {assign var="isDeliveryMethodChecked" value="true"}
+                                {/if}
                                 <label for="delivery-method_{$ID}">
-                                    <input type="radio" name="{$name}" id="delivery-method_{$ID}" {if $value == $ID}checked="checked"{/if} value="{$ID}">
+                                    <input type="radio" name="{$name}" id="delivery-method_{$ID}"{if $isDeliveryMethodChecked} checked="checked"{/if} value="{$ID}">
                                     <strong>{$TITLE}</strong> / {currency attr="symbol"} {$POSTAGE}
                                 </label>
                             {/form_field}