Additional admin UI fixes after hosts fix
Merge pull request #2785 from nicolaasmatthijs/adminUI

Additional admin UI fixes after hosts fix