diff --git a/mediagoblin/themes/airy/templates/mediagoblin/base.html b/mediagoblin/themes/airy/templates/mediagoblin/base.html
index db500199..6e177ddb 100644
--- a/mediagoblin/themes/airy/templates/mediagoblin/base.html
+++ b/mediagoblin/themes/airy/templates/mediagoblin/base.html
@@ -28,8 +28,6 @@
     <link rel="shortcut icon"
           href="{{ request.staticdirect('/images/goblin.ico') }}" />
     <script src="{{ request.staticdirect('/js/extlib/jquery.js') }}"></script>
-    <script type="text/javascript"
-          src="{{ request.staticdirect('/js/header_dropdown.js') }}"></script>
     <!--[if lt IE 9]>
       <script src="{{ request.staticdirect('/js/extlib/html5shiv.js') }}"></script>
     <![endif]-->
@@ -47,13 +45,18 @@
             <a class="logo"
                href="{{ request.urlgen('index') }}">
                <img src="{{ request.staticdirect('/images/logo.png', 'theme') }}"
-               alt="{% trans %}MediaGoblin logo{% endtrans %}" />
+                   alt="{% trans %}MediaGoblin logo{% endtrans %}" />
             </a>
           {% endblock mediagoblin_logo %}
           {% block mediagoblin_header_title %}{% endblock %}
           <div class="header_right">
             {% if request.user %}
-              <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', user= request.user.username) }}">{{ request.user.username }}</a>{% trans %}'s account{% endtrans %}
+              {% trans
+                  user_url=request.urlgen('mediagoblin.user_pages.user_home',
+                                          user= request.user.username),
+                  user_name=request.user.username -%}
+                <a href="{{ user_url }}">{{ user_name }}</a>'s account
+              {%- endtrans %}
               (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}log out{% endtrans %}</a>)
               {% if request.user and request.user.status == 'active' %}
                 <a class="button_action" href="{{ request.urlgen('mediagoblin.submit.start') }}">{% trans %}Add media{% endtrans %}</a>
@@ -65,7 +68,8 @@
                {% trans %}Verify your email!{% endtrans %}</a>
               {% endif %}
             {% else %}
-              <a href="{{ request.urlgen('mediagoblin.auth.login') }}">
+              <a href="{{ request.urlgen('mediagoblin.auth.login') }}?next={{
+                                                request.base_url|urlencode }}">
                 {% trans %}Log in{% endtrans %}</a>
             {% endif %}
           </div>