Added support for quoting user names that contain commas.