The water trap underneath the car in right rear seat area has a water sensor built in. You have to drop the trap to get to it, I'm not sure how servicable it is, I recently bought a spare trap that I plan to take apart to see. My glowplug light flickers too.
If you want to disconnect that water sensor, inside the trunk, right front corner on the floor there is an access to the fuel tank, the sensor wires come through that with the disconnect inside the trunk just ahead of the access panel, under a piece of foam. You dont need to take the acccess panel off.
At least that is where my '91 jetta has it.