Resolve these unnecessary altercations with colored straws. IKEA puts out a 4-color pack that’s just perfect for this trick. Just have everyone pick a color to distinguish their glass.  As an added bonus, with fewer glasses abandoned there are fewer glasses to wash.

Keep the straws right next to the water glasses to make this an easy habit to adopt.