Tweaked variable handling

Added braces to username variable to help ensure correct expansion. Though frankly the username is *quite* unlikely to have any characters that would cause a problem ;)