diff --git a/example_project/urls.py b/example_project/urls.py
index f2d2de3a..6de8f59f 100644
--- a/example_project/urls.py
+++ b/example_project/urls.py
@@ -32,8 +32,8 @@
     (r'^admin/doc/', include('django.contrib.admindocs.urls')),
     (r'^admin/', include(admin.site.urls)),
 
-    url(r'^accounts/login/$', 'django.contrib.auth.views.login'),
-    url(r'^accounts/logout/$', 'django.contrib.auth.views.logout'),
+    url(r'^accounts/login/$', 'django.contrib.auth.views.login', name='login'),
+    url(r'^accounts/logout/$', 'django.contrib.auth.views.logout', {'next_page': '/'}, name='logout'),
 
     url(r'^', include('speeches.urls', app_name='speeches', namespace='speeches')),
 )
diff --git a/speeches/templates/speeches/base.html b/speeches/templates/speeches/base.html
index 26f6c17c..7c0274d4 100644
--- a/speeches/templates/speeches/base.html
+++ b/speeches/templates/speeches/base.html
@@ -44,11 +44,22 @@
             <div class="full-page__unit">
               <h1><a href="{% url 'speeches:home' %}">SayIt</a></h1>
 
-              <ul class="inline-list">
+              <ul class="inline-list left">
                 <li><a href="{% url 'speeches:home' %}">{% trans 'Home' %}</a></li>
                 <li><a href="{% url 'speeches:speaker-list' %}">{% trans 'Speakers' %}</a></li>
                 <li><a href="{% url 'speeches:parentless-list' %}">{% trans 'Speeches' %}</a></li>
               </ul>
+
+              <ul class="unstyled-list right">
+                {% if request.is_user_instance %}
+                  <li>{% trans 'Welcome,' %} {% firstof user.get_short_name user.get_username %}.
+                      <a href="{% url 'logout' %}">{% trans 'Log out' %}</a>
+                  </li>
+                {% else %}
+                  <li><a href="{% url 'login' %}">{% trans 'Log in' %}</a></li>
+                {% endif %}
+              </ul>
+
             </div>
           </div>
         </header>