Fix issue with new admin [MJ-812]