diff --git a/InvenTree/InvenTree/urls.py b/InvenTree/InvenTree/urls.py
index 1c0cc7cefe..ca4afc4e55 100644
--- a/InvenTree/InvenTree/urls.py
+++ b/InvenTree/InvenTree/urls.py
@@ -47,7 +47,7 @@ urlpatterns = [
     url(r'^auth/', include('rest_framework.urls', namespace='rest_framework')),
 
     url(r'^login/', auth_views.login, name='login'),
-    url(r'^logout/', auth_views.logout, name='logout'),
+    url(r'^logout/', auth_views.logout, {'template_name': 'registration/logout.html'}, name='logout'),
     url(r'^admin/', admin.site.urls),
 
     url(r'^api/', include(apipatterns)),
diff --git a/InvenTree/templates/navbar.html b/InvenTree/templates/navbar.html
index 449eb20533..5f6c1f750b 100644
--- a/InvenTree/templates/navbar.html
+++ b/InvenTree/templates/navbar.html
@@ -11,5 +11,17 @@
       <li><a href="{% url 'build-index' %}">Build</a></li>
       <li><a href="{% url 'company-index' %}">Companies</a></li>
     </ul>
+    <ul class="nav navbar-nav navbar-right">
+    {% if user.is_authenticated %}
+      <li class='dropdown'>
+          <a class='dropdown-toggle' data-toggle='dropdown' href="#"><span class="glyphicon glyphicon-user"></span>{{ user.get_username }}</a>
+          <ul class='dropdown-menu'>
+              <li><a href="{% url 'logout' %}">Logout</a></li>
+          </ul>
+      </li>
+    {% else %}
+      <li><a href="{% url 'login' %}"><span class="glyphicon glyphicon-log-in"></span> Login</a></li>
+    {% endif %}
+    </ul>
   </div>
 </nav>
\ No newline at end of file