diff --git a/rhodecode/public/css/login.less b/rhodecode/public/css/login.less
--- a/rhodecode/public/css/login.less
+++ b/rhodecode/public/css/login.less
@@ -22,13 +22,27 @@
         float: none;
     }
 
-    .header {
+    .header-account {
+        min-height: 49px;
         width: 100%;
-        padding: 0 35px;
+        padding: 0 @header-padding;
         box-sizing: border-box;
+        position: relative;
+        vertical-align: bottom;
+
+        background-color: @grey1;
+        color: @grey5;
 
         .title {
             padding: 0;
+            overflow: visible;
+        }
+
+        &:before,
+        &:after {
+            content: "";
+            clear: both;
+            width: 100%;
         }
     }
 
diff --git a/rhodecode/public/css/main.less b/rhodecode/public/css/main.less
--- a/rhodecode/public/css/main.less
+++ b/rhodecode/public/css/main.less
@@ -263,9 +263,6 @@ input.inline[type="file"] {
 // HEADER
 .header {
 
-    // TODO: johbo: Fix login pages, so that they work without a min-height
-    // for the header and then remove the min-height. I chose a smaller value
-    // intentionally here to avoid rendering issues in the main navigation.
     min-height: 49px;
     min-width: 1024px;
 
diff --git a/rhodecode/templates/login.mako b/rhodecode/templates/login.mako
--- a/rhodecode/templates/login.mako
+++ b/rhodecode/templates/login.mako
@@ -10,7 +10,7 @@
 
 <style>body{background-color:#eeeeee;}</style>
 <div class="loginbox">
-    <div class="header">
+    <div class="header-account">
         <div id="header-inner" class="title">
             <div id="logo">
                 <div class="logo-wrapper">
diff --git a/rhodecode/templates/password_reset.mako b/rhodecode/templates/password_reset.mako
--- a/rhodecode/templates/password_reset.mako
+++ b/rhodecode/templates/password_reset.mako
@@ -10,7 +10,7 @@
 <style>body{background-color:#eeeeee;}</style>
 
 <div class="loginbox">
-    <div class="header">
+    <div class="header-account">
         <div id="header-inner" class="title">
             <div id="logo">
                 <div class="logo-wrapper">
diff --git a/rhodecode/templates/register.mako b/rhodecode/templates/register.mako
--- a/rhodecode/templates/register.mako
+++ b/rhodecode/templates/register.mako
@@ -10,7 +10,7 @@
 <style>body{background-color:#eeeeee;}</style>
 
 <div class="loginbox">
-    <div class="header">
+    <div class="header-account">
         <div id="header-inner" class="title">
             <div id="logo">
                 <div class="logo-wrapper">