I've just noticed this is wrong. We should be using the original username and hostname not the real username and real hostname because that is how the passwords are currently set up. This will only affect folks who have changed their hostname/username since the account was set up and those that saved the passwords on one of the new builds up until now. Existing users who have saved passwords are protected by the "GetPasswordWithoutUI" function (which correctly uses the original versions). ForgetPassword also uses the original versions, so this patch is just reverting everything to be the same. We should certainly be consistent in our usage.

Patch checked in: http://hg.mozilla.org/comm-central/rev/78e4ec0e00a4