Keep a water bottle at your desk. You might find yourself mindlessly drinking from it more than you'd expect, whereas if you had to go someplace to get water, you might be more inclined to ignore the thirst.
As said above, that's what I do. I drink it through the day but that's a conscious choice and not something my body tells me to. If I waited to be thirsty, I would only drink before bed.