Better support for Admin on same domain, cleanup.