diff --git a/index.cgi b/index.cgi
index 02896ae383..82fa5ede97 100755
--- a/index.cgi
+++ b/index.cgi
@@ -90,8 +90,6 @@ else {
     $vars->{'release'} = Bugzilla::Update::get_notifications();
   }
 
-  $vars->{use_login_page} = 1;
-
   # Generate and return the UI (HTML page) from the appropriate template.
   $template->process("index.html.tmpl", $vars)
     or ThrowTemplateError($template->error());
diff --git a/template/en/default/account/auth/login-small.html.tmpl b/template/en/default/account/auth/login-small.html.tmpl
index a860d071c1..201d0cb99e 100644
--- a/template/en/default/account/auth/login-small.html.tmpl
+++ b/template/en/default/account/auth/login-small.html.tmpl
@@ -37,8 +37,12 @@
   [% END %]
   [% script_url = login_target _ connector _ "GoAheadAndLogIn=1" %]
   <a id="login_link[% qs_suffix %]" href="[% script_url FILTER html %]"
-     class='show_mini_login_form' data-qs-suffix="[% qs_suffix FILTER html %]">Log In</a>
+     [% IF !use_login_page %]
+     class='show_mini_login_form'
+     [% END %]
+     data-qs-suffix="[% qs_suffix FILTER html %]">Log In</a>
 
+  [% IF !use_login_page %]
   <div id="mini_login[% qs_suffix FILTER html %]" class="mini-popup mini_login bz_default_hidden">
   [% Hook.process('additional_methods') %]
 
@@ -86,7 +90,9 @@
     </a>
   </form>
   </div>
+  [% END %]
 </li>
+[% IF !use_login_page %]
 <li id="forgot_container[% qs_suffix %]">
   <a id="forgot_link[% qs_suffix %]" href="[% script_url FILTER html %]#forgot"
      class='show_forgot_form'
@@ -104,3 +110,4 @@
   </form>
   </div>
 </li>
+[% END %]
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index cbef59f2a5..3d1bf4ba84 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -405,7 +405,7 @@
       <ul id="header-login" class="links">
           [% PROCESS "account/auth/signup-small.html.tmpl" qs_suffix = "_top" %]
         [% IF user.authorizer.can_login %]
-          [% PROCESS "account/auth/login-small.html.tmpl" qs_suffix = "_top" %]
+          [% PROCESS "account/auth/login-small.html.tmpl" qs_suffix = "_top" use_login_page = use_login_page %]
         [% END %]
       </ul>
     [% END %]
diff --git a/template/en/default/global/ip-blocked.html.tmpl b/template/en/default/global/ip-blocked.html.tmpl
index b60ea41ea2..eb0ec9efab 100644
--- a/template/en/default/global/ip-blocked.html.tmpl
+++ b/template/en/default/global/ip-blocked.html.tmpl
@@ -3,6 +3,7 @@
 [% title = "Too Many Requests" %]
 
 [% PROCESS global/header.html.tmpl
+           use_login_page = 1
            robots = 'noindex' %]
 
 <h1>[% title FILTER html %]</h1>