The present invention describes a system (1) enabling treating water from a water tank (3), which water tank (3) is arranged in a water distribution architecture also comprising one or more user units (8), said system (1) also enabling recycling of water or discarding of water not suitable to recycle, said system (1) comprising a water distribution unit (2), at least one water treating unit (6) and a sensor unit (7) arranged for measurement of at least water quality, said water distribution unit (2) comprising one common user unit inlet 9 connectable via piping to said one or more user units (8) on their used water output side; said water distribution unit (2) further comprising a contaminated water outlet (10); and said water distribution unit (2) further comprising at least one water recirculation port (1000) connectable via piping to the water tank (3) to enable flowing water between the water distribution unit (2) and the water tank (3); and wherein said at least one water treating unit (6) enables to treat water to increase the water quality thereof and where the sensor unit (7) is connected to a control unit, which, based on the measurement of the water quality, is arranged to decide if water should be recycled to the water tank (3) from the water distribution unit (2) or should be discarded via the contaminated water outlet (10) from the water distribution unit (2)..