Reset Password link is broken for users with space in username

When a user with a space in their username: ‘John Doe’ requests a password reset email the link in the is broken. The first and last name have a space between and the last name is left off the URL when the link is clicked.

http://my.domain.com/mysecretcode?action=rp&key=QlCCAQP0d3ZCEGf5I&login=John Doe

So when my member clicks it it takes them to:

http://my.domain.com/mysecretcode?action=rp&key=QlCCAQP0d3ZCEGf5I&login=John

and it says the link is not valid.

I know, easy to copy and paste the link and it works. But I am dealing with about 300 older people that are constantly losing passwords and resetting them. I’m tired of hearing about it.

I can’t figure where to replace the space with %20 which seems like it should fix the problem.

Thanks for any help,
Tim