diff --git a/app/login.py b/app/login.py
index 20fb494..12aff9f 100644
--- a/app/login.py
+++ b/app/login.py
@@ -24,7 +24,7 @@ def logout():
     if 'zeus_token' in session:
         session.pop('zeus_token', None)
     logout_user()
-    return redirect(url_for('admin.index'))
+    return redirect(url_for('home'))
 
 
 def before_request():
diff --git a/app/templates/layout.html b/app/templates/layout.html
index 03685c6..cef4cb0 100644
--- a/app/templates/layout.html
+++ b/app/templates/layout.html
@@ -15,7 +15,12 @@
               <li><a href="{{ url_for('home') }}">Home</a></li>
               <li><a href="{{ url_for('stats') }}">Stats</a></li>
               <li><a href="{{ url_for('about') }}">About</a></li>
-              <li><a href="{{ url_for('login') }}">Login</a></li>
+              {% if current_user.is_anonymous() %}
+                  <li><a href="{{ url_for('login') }}">Login</a></li>
+              {% else %}
+                  <li><a href="{{ url_for('logout') }}">Logout</a></li>
+                  <li>{{ current_user.username }}</li>
+              {% endif %}
           </ul>
         </nav>
       </div>