Replaces spaces in username.
Merge pull request #1986 from matham/master

Replaces spaces in username.