I've only been in this situation once, and I managed to upgrade both of us since we were traveling together. Granted, I knew him well enough so I did see any awkward issues with appearances or anything of the sort.

I can definitely see how this situation would get complicated, but sounds like your client had a good sense of humor and wasn't the type to make a fuss.