diff --git a/kepi/kepi/settings.py b/kepi/kepi/settings.py
index 6465938..5933c7e 100644
--- a/kepi/kepi/settings.py
+++ b/kepi/kepi/settings.py
@@ -212,6 +212,7 @@ REST_FRAMEWORK = {
 
 AUTH_USER_MODEL = 'trilby_api.TrilbyUser'
 LOGIN_REDIRECT_URL = '/'
+LOGOUT_REDIRECT_URL = '/'
 
 try:
     from .local_config import *
diff --git a/kepi/tophat_ui/templates/navbar.html b/kepi/tophat_ui/templates/navbar.html
index 2cc16d6..3c80318 100644
--- a/kepi/tophat_ui/templates/navbar.html
+++ b/kepi/tophat_ui/templates/navbar.html
@@ -2,8 +2,14 @@
         <li class="nav-item">
                 <a class="nav-link" href="/">Home</a>
         </li>
+        {% if user.is_authenticated %}
+        <li class="nav-item">
+                <a class="nav-link" href="/accounts/login/">&#x1f452;{{ user.usernme }}</a>
+        </li>
+        {% else %}
         <li class="nav-item">
                 <a class="nav-link" href="/accounts/login/">Login</a>
         </li>
+        {% endif %}
 </ul>