Fix placeholderadmin permission check
Merge pull request #3617 from yakky/feature/backport_3610

Fix placeholderadmin permission check