Fixes typos
Fixes #1232: added support for spaces in user name