diff --git a/templates/frontOffice/default/address-update.html b/templates/frontOffice/default/address-update.html
index 83c13c84e..965d96406 100644
--- a/templates/frontOffice/default/address-update.html
+++ b/templates/frontOffice/default/address-update.html
@@ -26,7 +26,16 @@
     {loop name="customer.update" type="address" customer="current" id="{$address_id}"}
         <form id="form-address" class="form-horizontal" action="{url path="/address/update/{$address_id}"}" method="post">
         {form_field form=$form field='success_url'}
-            {$next_url=$smarty.get.next|default:{url path="/account"}}
+            <p>
+                next: {$smarty.get.next}<br />
+                default: {url path="/account"}<br />
+                successs: {$value}
+            </p>
+            {if $value}
+                {$next_url=$value}
+            {else}
+                {$next_url=$smarty.get.next|default:{url path="/account"}}
+            {/if}
             <input type="hidden" name="{$name}" value="{$next_url}" />
         {/form_field}
 
diff --git a/templates/frontOffice/default/address.html b/templates/frontOffice/default/address.html
index f9da8ccd2..ceacac72f 100644
--- a/templates/frontOffice/default/address.html
+++ b/templates/frontOffice/default/address.html
@@ -25,8 +25,12 @@
         {form name="thelia.front.address.create"}
         <form id="form-address" class="form-horizontal" action="{url path="/address/create"}" method="post">
             {form_field form=$form field='success_url'}
+                {if $value}
+                {$next_url=$value}
+                {else}
                 {$next_url=$smarty.get.next|default:{url path="/account"}}
-                <input type="hidden" name="{$name}" value="{url path="/account"}" />
+                {/if}
+                <input type="hidden" name="{$name}" value="{$next_url}" />
             {/form_field}
 
             {form_field form=$form field='error_message'}