diff --git a/templates/default/account.html b/templates/default/account.html
index 877093d42..0f9782df7 100644
--- a/templates/default/account.html
+++ b/templates/default/account.html
@@ -58,8 +58,8 @@
                                     <span class="email">{mailto address="{$EMAIL}" encode="hex"}</span>
                                 </li>
                                 <li class="group-btn">
-                                    <a href="{url path="/account/update/{$ID}"}" class="btn btn-change-account"><i class="icon-pencil"></i> {intl l="Change my account informations"}</a>
-                                    <a href="{url path="/account/password/{$ID}"}" class="btn btn-change-password"><i class="icon-lock"></i> {intl l="Change my password"}</a>
+                                    <a href="{url path="/account/update/"}" class="btn btn-change-account"><i class="icon-pencil"></i> {intl l="Change my account informations"}</a>
+                                    <a href="{url path="/account/password/"}" class="btn btn-change-password"><i class="icon-lock"></i> {intl l="Change my password"}</a>
                                 </li>
                             </ul>
                             {/loop}
@@ -82,7 +82,7 @@
                                 <tbody>
                                 {loop type="address" name="customer.addresses" customer="current"}
                                 <tr class="{if $DEFAULT == 1}address-primary{else}address-additional{/if}" id="customer-address-{$ID}">
-                                    <th>{$LABEL}</th>
+                                    <th>{$LABEL|default:"{intl l='Address %nb' nb={$LOOP_COUNT}}"}</th>
                                     <td>
                                         <ul class="list-address">
                                             <li>