#295 fix fallout from admin refactoring