"Hygiene issue"

Having spent a while in A&E at the Alex in Redditch I was watching people using the fresh drinking water cooler. The stack of cups were loose on top of the machine and people were picking them up from all angles touching all the 'lips' of the cups whilst pulling one out for their use. In addition people were bringing there own water bottles to refill with the neck of their bottles being pushed up against the dispensing tap. Surely the cups should be in a dispenser where they are accessed from the base of the cup only and the tap should be such that germs from peoples bottles cannot be transferred. Has this area been risk assessed?