[#2078] more specificity for the new admin