"Set my password" link in "Account created" emails go to user profile page and not reset password link

When creating a user account and leaving the password blank so the user can set a password themselves, the email that arrives has the "Set my password" link pointing at the profile page (/secure/ViewProfile.jspa) instead of the reset password link (/secure/ResetPassword!default.jspa?os_username=<user>&token=<token>).

This occurs in both fireball 168.1 and 169.