account for spaces in user names, fix #2140