diff --git a/templates/default/account-password.html b/templates/default/account-password.html
index 5b14ac1f6..2852113ac 100644
--- a/templates/default/account-password.html
+++ b/templates/default/account-password.html
@@ -1,14 +1,18 @@
 {extends file="layout.tpl"}
 
+{* Security *}
+{block name="no-return-functions" prepend}
+    {check_auth context="front" role="CUSTOMER" login_tpl="login"}
+{/block}
+
 {* Body Class *}
 {block name="body-class"}page-account-password{/block}
 
 {* Breadcrumb *}
 {block name='no-return-functions' append}
-    {$breadcrumbs = [['title' => {intl l="Account"}, 'url'=>{url path="/account"}]]}
     {$breadcrumbs = [
-    ['title' => {intl l="Account"}, 'url'=>{url path="/account"}],
-    ['title' => {intl l="Change Password"}, 'url'=>{url path="/account/password"}]
+        ['title' => {intl l="Account"}, 'url'=>{url path="/account"}],
+        ['title' => {intl l="Change Password"}, 'url'=>{url path="/account/password"}]
     ]}
 {/block}
 
diff --git a/templates/default/account-update.html b/templates/default/account-update.html
index 7d9f581a7..1cdb1c4cd 100644
--- a/templates/default/account-update.html
+++ b/templates/default/account-update.html
@@ -1,14 +1,18 @@
 {extends file="layout.tpl"}
 
+{* Security *}
+{block name="no-return-functions" prepend}
+    {check_auth context="front" role="CUSTOMER" login_tpl="login"}
+{/block}
+
 {* Body Class *}
 {block name="body-class"}page-account-update{/block}
 
 {* Breadcrumb *}
 {block name='no-return-functions' append}
-    {$breadcrumbs = [['title' => {intl l="Account"}, 'url'=>{url path="/account"}]]}
     {$breadcrumbs = [
-    ['title' => {intl l="Account"}, 'url'=>{url path="/account"}],
-    ['title' => {intl l="Update Profile"}, 'url'=>{url path="/account/update"}]
+        ['title' => {intl l="Account"}, 'url'=>{url path="/account"}],
+        ['title' => {intl l="Update Profile"}, 'url'=>{url path="/account/update"}]
     ]}
 {/block}
 
diff --git a/templates/default/account.html b/templates/default/account.html
index 21cbd2f0e..a8298020e 100644
--- a/templates/default/account.html
+++ b/templates/default/account.html
@@ -1,5 +1,6 @@
 {extends file="layout.tpl"}
 
+{* Security *}
 {block name="no-return-functions" prepend}
     {check_auth context="front" role="CUSTOMER" login_tpl="login"}
 {/block}
@@ -7,7 +8,7 @@
 {* Breadcrumb *}
 {block name='no-return-functions' append}
     {$breadcrumbs = [
-    ['title' => {intl l="Account"}, 'url'=>{url path="/account"}]
+        ['title' => {intl l="Account"}, 'url'=>{url path="/account"}]
     ]}
 {/block}
 
diff --git a/templates/default/address-update.html b/templates/default/address-update.html
index 710628015..8da324cb7 100644
--- a/templates/default/address-update.html
+++ b/templates/default/address-update.html
@@ -1,6 +1,7 @@
 {extends file="layout.tpl"}
 
-{block name="no-return-functions"}
+{* Security *}
+{block name="no-return-functions" prepend}
     {check_auth context="front" role="CUSTOMER" login_tpl="login"}
 {/block}
 
@@ -20,7 +21,7 @@
 
     <article class="col-main" role="main" aria-labelledby="main-label">
 
-    <h1 id="main-label" class="page-header">{intl l="Create New Address"}</h1>
+    <h1 id="main-label" class="page-header">{intl l="Address Update"}</h1>
     {form name="thelia.front.address.update"}
         {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" role="form">
diff --git a/templates/default/address.html b/templates/default/address.html
index 376adafa2..c6186defb 100644
--- a/templates/default/address.html
+++ b/templates/default/address.html
@@ -1,6 +1,7 @@
 {extends file="layout.tpl"}
 
-{block name="no-return-functions"}
+{* Security *}
+{block name="no-return-functions" prepend}
     {check_auth context="front" role="CUSTOMER" login_tpl="login"}
 {/block}
 
diff --git a/templates/default/order-delivery.html b/templates/default/order-delivery.html
index 12c65b489..b23be64f7 100644
--- a/templates/default/order-delivery.html
+++ b/templates/default/order-delivery.html
@@ -1,6 +1,7 @@
 {extends file="layout.tpl"}
 
-{block name="no-return-functions"}
+{* Security *}
+{block name="no-return-functions" prepend}
     {check_auth context="front" role="CUSTOMER" login_tpl="login"}
     {check_cart_not_empty}
 {/block}
diff --git a/templates/default/order-invoice.html b/templates/default/order-invoice.html
index 28fea851b..bc9d7047b 100644
--- a/templates/default/order-invoice.html
+++ b/templates/default/order-invoice.html
@@ -1,6 +1,7 @@
 {extends file="layout.tpl"}
 
-{block name="no-return-functions"}
+{* Security *}
+{block name="no-return-functions" prepend}
     {check_auth context="front" role="CUSTOMER" login_tpl="login"}
     {check_cart_not_empty}
     {check_valid_delivery}
diff --git a/templates/default/order-placed.html b/templates/default/order-placed.html
index decd30c77..4931896f5 100644
--- a/templates/default/order-placed.html
+++ b/templates/default/order-placed.html
@@ -1,5 +1,10 @@
 {extends file="layout.tpl"}
 
+{* Security *}
+{block name="no-return-functions" prepend}
+    {check_auth context="front" role="CUSTOMER" login_tpl="login"}
+{/block}
+
 {* Body Class *}
 {block name="body-class"}page-order-payment{/block}