Add in the users username to the return value as well if it's not already supplied.  #341