diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index a0e0730d..9894f27a 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -34,9 +34,8 @@
               {% endblock %}{% block mediagoblin_header_title %}MediaGoblin Home{% endblock %}
         <div class="mediagoblin_header_right">
           {% if request.user %}
-                Welcome {{ request.user['username'] }}! --
-                <a href="{{ request.urlgen('mediagoblin.auth.logout') }}">
-                  Logout</a>
+                {{ request.user['username'] }}'s account 
+                (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">logout</a>)
           {% else %}
                 <a href="{{ request.urlgen('mediagoblin.auth.login') }}">
                   Login</a>