Fix admin improvement, again