This is why I only drink my water out of a coffee cup. You don't have to worry about flushing all electrolytes and you also get up more frequently to refill your water in the first place.
For some reason I can't drink cold liquids out of an opaque cup. It feels really weird to me to drink water or juice out of a mug, it needs to be in a glass or clear water bottle.