Fix admin orders

Requires proper refactoring...