From c1ef147ad206002fb8d15f0667de45cef08fef28 Mon Sep 17 00:00:00 2001
From: Max Goodman <max@reddit.com>
Date: Wed, 8 Jan 2014 14:33:10 -0800
Subject: [PATCH] Add username display to the reset password form.

---
 r2/r2/controllers/front.py         | 12 ++++++++++--
 r2/r2/templates/resetpassword.html |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/r2/r2/controllers/front.py b/r2/r2/controllers/front.py
index 961dc2cdd..b791068b2 100755
--- a/r2/r2/controllers/front.py
+++ b/r2/r2/controllers/front.py
@@ -1294,8 +1294,16 @@ class FormsController(RedditController):
                 self.logout()
                 return self.redirect(request.path)
 
-        return BoringPage(_("reset password"),
-                          content=ResetPassword(key=key, done=done)).render()
+        token_user = Account._by_fullname(token.user_id, data=True)
+
+        return BoringPage(
+            _("reset password"),
+            content=ResetPassword(
+                key=key,
+                done=done,
+                username=token_user.name,
+            )
+        ).render()
 
     @disable_subreddit_css()
     @validate(VUser(),
diff --git a/r2/r2/templates/resetpassword.html b/r2/r2/templates/resetpassword.html
index a7ceb7425..e2b980779 100644
--- a/r2/r2/templates/resetpassword.html
+++ b/r2/r2/templates/resetpassword.html
@@ -31,7 +31,7 @@ ${error_field("EXPIRED", 'p')}
 <form id="chpass" method="post" action="/api/resetpassword" 
       onsubmit="return post_form(this,'resetpassword')">
 
-  <h1>choose a new password</h1>
+  <h1>choose a new password for /u/${thing.username}</h1>
   <input type="hidden" name="key" value="${thing.key}"/>
 
   <div class="spacer">