diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 7ce71789..9e5fdcce 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -52,6 +52,10 @@ label {
     margin-right: auto;
 }
 
+.mediagoblin_header_right {
+    float:right;
+}
+
 .button_red, .button_green {
     font-family: 'Carter One', arial, serif;
     height: 28px;
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index e785cfcc..a0e0730d 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -32,7 +32,7 @@
               {% block mediagoblin_logo %}
                 <a href="{{ request.urlgen('index') }}"><img src="{{ request.staticdirect('/images/icon.png') }}" class="icon" /></a>
               {% 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') }}">
@@ -41,6 +41,7 @@
                 <a href="{{ request.urlgen('mediagoblin.auth.login') }}">
                   Login</a>
           {% endif %}
+        </div>
       </div>
       </div>
       {% endblock %}