diff --git a/templates/frontOffice/default/index.html b/templates/frontOffice/default/index.html
index 53aa8c0f1..f5bcfa668 100644
--- a/templates/frontOffice/default/index.html
+++ b/templates/frontOffice/default/index.html
@@ -12,6 +12,7 @@
 {block name='breadcrumb'}{/block}
 
 {block name="main-content"}
+    u={viewurl view="legal"}
     <section class="carousel-container">
         <div id="carousel" class="carousel slide">
             <div class="carousel-wrapper">
diff --git a/templates/frontOffice/default/login.html b/templates/frontOffice/default/login.html
index 02849c931..6587e212e 100644
--- a/templates/frontOffice/default/login.html
+++ b/templates/frontOffice/default/login.html
@@ -19,7 +19,7 @@
             <form id="form-login" action="{url path="/login"}" method="post" {form_enctype form=$form} novalidate>
                 {if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
                 {form_field form=$form field='success_url'}
-                    <input type="hidden" name="{$name}" value="{navigate to="return_to"}"> {* the url the user is redirected to on login success *}
+                    <input type="hidden" name="{$name}" value="{navigate to="previous"}"> {* the url the user is redirected to on login success *}
                 {/form_field}
 
                 {form_field form=$form field='error_message'}