diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py
index 46c937b0..71a5f379 100644
--- a/mediagoblin/auth/views.py
+++ b/mediagoblin/auth/views.py
@@ -236,7 +236,8 @@ def forgot_password(request):
 
     Sends an email with an url to renew forgotten password
     """
-    fp_form = auth_forms.ForgotPassForm(request.POST)
+    fp_form = auth_forms.ForgotPassForm(request.POST,
+                                        username=request.GET.get('username'))
 
     if request.method == 'POST' and fp_form.validate():
 
diff --git a/mediagoblin/static/js/autofilledin_password.js b/mediagoblin/static/js/autofilledin_password.js
new file mode 100644
index 00000000..45e867fe
--- /dev/null
+++ b/mediagoblin/static/js/autofilledin_password.js
@@ -0,0 +1,25 @@
+/**
+ * GNU MediaGoblin -- federated, autonomous media hosting
+ * Copyright (C) 2012 MediaGoblin contributors.  See AUTHORS.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+$(document).ready(function(){
+  $('#forgot_password').click(function(event){
+    event.preventDefault();
+    window.location.pathname = $(this).attr('href') + '?username=' +
+                               $('#username').val();
+  });
+});
diff --git a/mediagoblin/templates/mediagoblin/auth/login.html b/mediagoblin/templates/mediagoblin/auth/login.html
index 39f07d33..8161ea9d 100644
--- a/mediagoblin/templates/mediagoblin/auth/login.html
+++ b/mediagoblin/templates/mediagoblin/auth/login.html
@@ -19,6 +19,11 @@
 
 {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
 
+{% block mediagoblin_head %}
+  <script type="text/javascript"
+          src="{{ request.staticdirect('/js/autofilledin_password.js') }}"></script>
+{% endblock %}
+
 {% block mediagoblin_content %}
   <form action="{{ request.urlgen('mediagoblin.auth.login') }}"
         method="POST" enctype="multipart/form-data">
@@ -38,7 +43,7 @@
       {% endif %}
       {{ wtforms_util.render_divs(login_form) }}
         <p>
-          <a href="{{ request.urlgen('mediagoblin.auth.forgot_password') }}">
+          <a href="{{ request.urlgen('mediagoblin.auth.forgot_password') }}" id="forgot_password">
           {% trans %}Forgot your password?{% endtrans %}</a>
         </p>
       <div class="form_submit_buttons">