Fixing the problem of space in the user name - work in progress