diff --git a/conntrackt/templates/conntrackt/template.html b/conntrackt/templates/conntrackt/template.html
--- a/conntrackt/templates/conntrackt/template.html
+++ b/conntrackt/templates/conntrackt/template.html
@@ -33,6 +33,14 @@
               <li class="{% active_link 'index' %}"><a href="{% url index %}"><i class="icon-home icon-white"></i> Main Page</a></li>
               <li class="{% active_link 'admin' %}"><a href="{% url admin:index %}"><i class="icon-wrench icon-white"></i> Administration</a></li>
             </ul>
+            <ul class="nav pull-right">
+              {% if user.is_anonymous %}
+              <li>{% html_link '<i class="icon-user icon-white"></i> Log-in' 'login' get="next="|add:request.path %}</li> %}
+              {% else %}
+              <li><a href=""><i class="icon-user icon-white"></i> {{user}}</a></li>
+              <li>{% html_link '<i class="icon-off icon-white"></i> Log-out' "logout" get="next="|add:request.path %}</li>
+              {% endif %}
+            </ul>
               {% endblock %}
           </div>
         </div>