diff --git a/app/assets/javascripts/app/views/password/reset.jst.eco b/app/assets/javascripts/app/views/password/reset.jst.eco
index de43a6e9c..7ec97d400 100644
--- a/app/assets/javascripts/app/views/password/reset.jst.eco
+++ b/app/assets/javascripts/app/views/password/reset.jst.eco
@@ -10,7 +10,7 @@
         <form class="form-password">
           <div class="form-password-item"></div>
           <div class="form-controls">
-            <a class="subtle-link standalone pull-left cancel" href="#/"><%- @T( 'Cancel & Go Back' ) %></a>
+            <a class="subtle-link standalone pull-left cancel" href="#login"><%- @T( 'Cancel & Go Back' ) %></a>
             <button class="btn btn--primary submit pull-right"><%- @T( 'Submit' ) %></button>
           </div>
         </form>
diff --git a/app/assets/javascripts/app/views/signup.jst.eco b/app/assets/javascripts/app/views/signup.jst.eco
index 35b473ce7..a7e095378 100644
--- a/app/assets/javascripts/app/views/signup.jst.eco
+++ b/app/assets/javascripts/app/views/signup.jst.eco
@@ -4,7 +4,7 @@
       <h1><%- @T( 'Join' ) %> <%= @C( 'product_name' ) %></h1>
       <form>
         <div class="form-controls">
-          <a class="subtle-link standalone pull-left" href="#/"><%- @T( 'Cancel & Go Back' ) %></a>
+          <a class="subtle-link standalone pull-left" href="#login"><%- @T( 'Cancel & Go Back' ) %></a>
           <button class="btn btn--primary submit pull-right"><%- @T( 'Create my account' ) %></button>
         </div>
       </form>
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss
index 1ce69c509..59ad672b4 100644
--- a/app/assets/stylesheets/zammad.css.scss
+++ b/app/assets/stylesheets/zammad.css.scss
@@ -993,6 +993,7 @@ textarea,
   @extend .fit;
   display: table;
   width: 100%;
+  height: 100%;
   min-height: 100vh;
 }
 
@@ -4400,7 +4401,7 @@ footer {
 }
 
 .scrollPageHeader {
-  // @extend .tabsSidebar-sidebarSpacer;
+  @extend .tabsSidebar-sidebarSpacer;
   @extend .zIndex-6;
   @extend .horizontal;
   @extend .center;