Admin logic fix