Forgotten password link for username with a space

Good afternoon
We have has a spate of problems being reported from users not being able to reset their password from the “Forgotten Password” email. It transpires that all these users have a username with a space (e.g. jo bloggs).

The email generated by TML is not converting the space into a %20, so the link stops at the space and is therefore not valid. e.g.
https://www.something.com/resetpass/?key=Zizz7IwOkKzwhtylkxVS&login=jo bloggs
rather than
https://www.something.com/resetpass/?key=Zizz7IwOkKzwhtylkxVS&login=jo%20bloggs

Would it be possible to fix this please?

Thanks in anticipation