diff --git a/IPython/frontend/html/notebook/handlers.py b/IPython/frontend/html/notebook/handlers.py
index 92c821e80..ca92d5967 100644
--- a/IPython/frontend/html/notebook/handlers.py
+++ b/IPython/frontend/html/notebook/handlers.py
@@ -182,7 +182,10 @@ class LoginHandler(AuthenticatedHandler):
         )
 
     def get(self):
-        self._render()
+        if self.current_user:
+            self.redirect(self.get_argument('next', default='/'))
+        else:
+            self._render()
 
     def post(self):
         pwd = self.get_argument('password', default=u'')
diff --git a/IPython/frontend/html/notebook/templates/layout.html b/IPython/frontend/html/notebook/templates/layout.html
index ae8a0161b..1f24a40b8 100644
--- a/IPython/frontend/html/notebook/templates/layout.html
+++ b/IPython/frontend/html/notebook/templates/layout.html
@@ -23,7 +23,9 @@
 <div id="header">
     <span id="ipython_notebook"><h1>IPython Notebook</h1></span>
     <span id="login_widget">
-      <button id="logout">Logout</button>
+      {% if current_user and current_user != 'anonymous' %}
+        <button id="logout">Logout</button>
+      {% end %}
     </span>
     {% block header %}
     {% end %}