My old HD621 PSU died before I sold it on, I replaced it with a new XP Power ECM40UT31 as far as I remember there was no issues and was a cheap fix. No soldering required just time and a screwdriver

Neil