A water distribution apparatus comprises a water user outlet facility and a water recirculation loop. The water re-circulation loop comprises a water supply, a water pump for establishing and maintaining a flow of water in the loop, a water delivery path extending from the pump to a water user outlet facility, a water return path extending from the water user outlet facility to the water supply, and a thermal disinfection apparatus disposed in the water delivery path for improving the potability of the water within the loop. A thermal heating apparatus and control is provided in the water delivery path or water storage tank to add thermal energy to prevent freezing of the stored water as well as the water flowing in the water re-circulation loop.