Using ubuntu-sso-client to reset password provides the wrong email

Bug Description:
Using Ubuntu-sso-client to test reset password, I discovered that the email sent out contains both the token and the link.

Upon testing we discovered that the token overrides the Link set password so we are safe to let this through for now but it would be nice to get fixed.

Version:
Django 1.1.1
Python 2.6.5 (r265:79063, Apr 16 2010, 14:15:55) [GCC 4.4.3]
preflight 0.1
SSO 11.07.26-0~0.IS.10.04
openid 2.2.1
piston 0.2.2

OS:
64bit Natty (trunk USC revno1974 )

Browser:
n/a

Problem URL:
n/a

Steps To Reproduce:
1. Get trunk USC
2. Run the ./run_against_rnr_testing_env.sh
3. Clear your USC password from seahorse
4. Open a package click be the first to review/Add a review
5. Click I have an account
6. Click Forgotten Password
7. Open your SSO email

Expected Result:
I expect to receive and email similar to the New account one that only has the token available to copy paste into the desktop client window.