Fix references in config client broken by new ui reshuffle