WIP: Fix admin controller