diff --git a/src/mailmanweb/static/mailmanweb/default/css/style.css b/src/mailmanweb/static/mailmanweb/default/css/style.css
index 0162dd1..714e201 100755
--- a/src/mailmanweb/static/mailmanweb/default/css/style.css
+++ b/src/mailmanweb/static/mailmanweb/default/css/style.css
@@ -11,6 +11,7 @@
 }
 
 .mm_canvas {
+    position: relative;
     width: 960px;
     margin: 0 auto;
 }
@@ -28,6 +29,11 @@
     margin: 0;
     padding: 5px 0 0 0;
 }
+.mm_loginName {
+    position: absolute;
+    right: 0;
+    bottom: 0;
+}
 .mm_metaNav li {
     float: left;
     margin-left: 20px;
@@ -40,6 +46,7 @@
 }
 .mm_metaNav .mm_todos,
 .mm_metaNav .mm_settings,
+.mm_metaNav .mm_logout,
 .mm_metaNav .mm_user {
     background-color: transparent;
     background-image: url(../img/icons.png);
@@ -49,9 +56,11 @@
 .mm_todos { background-position: 0px 5px; }
 .mm_settings { background-position: 0px -30px; }
 .mm_user { background-position: 0px -65px; }
+.mm_logout { background-position: 0px -240px; }
 .mm_todos:hover { background-position: 0px -100px; }
 .mm_settings:hover { background-position: 0px -135px; }
 .mm_user:hover { background-position: 0px -170px; }
+.mm_logout:hover { background-position: 0px -205px; }
 
 .mm_nav {
     padding: 20px 0 30px 0;
diff --git a/src/mailmanweb/static/mailmanweb/default/img/icons.png b/src/mailmanweb/static/mailmanweb/default/img/icons.png
index 2a48a44..9065265 100644
--- a/src/mailmanweb/static/mailmanweb/default/img/icons.png
+++ b/src/mailmanweb/static/mailmanweb/default/img/icons.png
Binary files differ
diff --git a/src/mailmanweb/templates/mailmanweb/base.html b/src/mailmanweb/templates/mailmanweb/base.html
index 31b5653..91f98b9 100644
--- a/src/mailmanweb/templates/mailmanweb/base.html
+++ b/src/mailmanweb/templates/mailmanweb/base.html
@@ -33,12 +33,15 @@
                     {% endif %}
                 	<li>
                         {% if user.is_authenticated %}
-                            Logged in as: <a href="{% url user_profile %}">{{ user.username }}</a>
+                		    <a class="mm_logout" href="{% url user_logout %}">Logout</a>
                         {% else %}
-                		<a class="mm_user" href="{% url user_login %}">Login</a>
+                		    <a class="mm_user" href="{% url user_login %}">Login</a>
                         {% endif %}
                 	</li>
                 </ul>
+                {% if user.is_authenticated %}
+                    <div class="mm_loginName">Logged in as: <a href="{% url user_profile %}">{{ user.username }}</a></div>
+                {% endif %}
             </div>
         </div>
     </header>