If the dispenser leaks only on the rinses, it might have something to do with the fill jets above the drawer. While it is filling for a rinse, partially pull the drawer open and see where the water is spraying down then shut off the machine and remove the drawer. You might have hard water deposits that are deflecting the spray and causing a leak. Is it leaking on the fill for all of the rinses or just the last one? The last one fills into the softener dispenser and that can be a whole different can of worms. Given the bad state of the dispenser when you got the machine, it might just need a bit of demineraling to stop the leaks. Good luck!