Better support usernames with spaces in them

Change-Id: I0b9e077789e560a7ca4822f80cfe206f41579662