Add filter around admin access check. Closes #3401