Sounds like diverter valve mate. Located in bottom right of boiler, sometimes the microswich fails or you can buy a referb kit with new diaphragm. Watch the arm move when someone switches the tap on.
I suggest calling Vailiant tech line as they'll give you more advice for free.