[UAT7,4] admin fixes