Make admin nicer.

And actually work.

Change-Id: Id90688422f5a116d136c29373c995fc16b6d084b