issue #20172: fix admin console

This has got a lot, but not all, of the bugfixes necessary.