diff --git a/IPython/frontend/html/notebook/templates/layout.html b/IPython/frontend/html/notebook/templates/layout.html
index 8ca2dcf..8d5e4d2 100644
--- a/IPython/frontend/html/notebook/templates/layout.html
+++ b/IPython/frontend/html/notebook/templates/layout.html
@@ -22,13 +22,19 @@
 
 <div id="header">
     <span id="ipython_notebook"><h1><img src='static/ipynblogo.png' alt='IPython Notebook'/></h1></span>
-    <span id="login_widget">
-      {% if logged_in %}
-        <button id="logout">Logout</button>
-      {% elif login_available and not logged_in %}
-        <button id="login">Login</button>
-      {% end %}
-    </span>
+
+    {% block login_widget %}
+
+      <span id="login_widget">
+        {% if logged_in %}
+          <button id="logout">Logout</button>
+        {% elif login_available and not logged_in %}
+          <button id="login">Login</button>
+        {% end %}
+      </span>
+
+    {% end %}
+
     {% block header %}
     {% end %}
 </div>
diff --git a/IPython/frontend/html/notebook/templates/login.html b/IPython/frontend/html/notebook/templates/login.html
index 161f285..4c5b2c0 100644
--- a/IPython/frontend/html/notebook/templates/login.html
+++ b/IPython/frontend/html/notebook/templates/login.html
@@ -13,6 +13,9 @@
 
 {% end %}
 
+{% block login_widget %}
+{% end %}
+
 {% block script %}
 <script type="text/javascript">
   $(document).ready(function() {
diff --git a/IPython/frontend/html/notebook/templates/logout.html b/IPython/frontend/html/notebook/templates/logout.html
index 94b9936..8087508 100644
--- a/IPython/frontend/html/notebook/templates/logout.html
+++ b/IPython/frontend/html/notebook/templates/logout.html
@@ -16,6 +16,9 @@
 
 {% end %}
 
+{% block login_widget %}
+{% end %}
+
 {% block script %}
 <script type="text/javascript">
   $(document).ready(function() {