diff --git a/mediagoblin/templates/mediagoblin/auth/login.html b/mediagoblin/templates/mediagoblin/auth/login.html
index 61c5a203..756f67c0 100644
--- a/mediagoblin/templates/mediagoblin/auth/login.html
+++ b/mediagoblin/templates/mediagoblin/auth/login.html
@@ -30,7 +30,17 @@
           {% trans %}Logging in failed!{% endtrans %}
         </div>
       {% endif %}
+      {% if allow_registration %}
+        <p>
+          {% trans %}Don't have an account yet?{% endtrans %} <a href="{{ request.urlgen('mediagoblin.auth.register') }}">
+            {%- trans %}Create one here!{% endtrans %}</a>
+        </p>
+      {% endif %}
       {{ wtforms_util.render_divs(login_form) }}
+        <p>
+          <a href="{{ request.urlgen('mediagoblin.auth.forgot_password') }}">
+          {% trans %}Forgot your password?{% endtrans %}</a>
+        </p>
       <div class="form_submit_buttons">
         <input type="submit" value="{% trans %}Log in{% endtrans %}" class="button"/>
       </div>
@@ -38,20 +48,6 @@
         <input type="hidden" name="next" value="{{ next }}" class="button"
                style="display: none;"/>
       {% endif %}
-      {% if allow_registration %}
-        <p>
-          {% trans %}Don't have an account yet?{% endtrans %}
-          <br />
-          <a href="{{ request.urlgen('mediagoblin.auth.register') }}">
-            {%- trans %}Create one here!{% endtrans %}</a>
-        </p>
-        <p>
-          {% trans %}Forgot your password?{% endtrans %}
-          <br />
-          <a href="{{ request.urlgen('mediagoblin.auth.forgot_password') }}">
-            {%- trans %}Change it!{% endtrans %}</a>
-        </p>
-      {% endif %}
     </div>
   </form>
 {% endblock %}