Custom permission types denied for Administrator on client

Restores evaluation of custom permission types for Administrator on client after merge conflict from backport.