Fixes validity issues with new admintoolbox