diff --git a/pandora/user/templates/password_reset_email.txt b/pandora/user/templates/password_reset_email.txt
index ebcff2c1..84d11c66 100644
--- a/pandora/user/templates/password_reset_email.txt
+++ b/pandora/user/templates/password_reset_email.txt
@@ -1,12 +1,7 @@
-Somebody tried to reset your password for {{sitename}}.
+To reset your password, please use the following token:
 
-If it is you, and still want to reset your password.
-Use this token
- 
- {{token}}
+{{token}}
 
-to reset your password.
+If you do not want to reset your password, no further action is required.
 
-If you did not request a password, you can safely ignore this e-mail.
-
-{{sitename}}
+{{sitename}} - {{url}}
diff --git a/pandora/user/views.py b/pandora/user/views.py
index 769bd076..dbb9df38 100644
--- a/pandora/user/views.py
+++ b/pandora/user/views.py
@@ -272,7 +272,7 @@ def requestToken(request):
             'sitename': settings.SITENAME,
         })
         message = template.render(context)
-        subject = '%s password reset' % settings.SITENAME
+        subject = '%s - Reset Password' % settings.SITENAME
         user.email_user(subject, message)
         response = json_response({
             'username': user.username
@@ -309,7 +309,7 @@ def findUser(request):
     data = json.loads(request.POST['data'])
     response = json_response(status=200, text='ok')
     if data['key'] == 'email':
-        response['data']['users'] = [u.email for u in User.objects.filter(email__iexact=data['value'])]
+        response['data']['users'] = [u.username for u in User.objects.filter(email__iexact=data['value'])]
     else:
         response['data']['users'] = [u.username for u in User.objects.filter(username__iexact=data['value'])]
     return render_to_json_response(response)