Merge pull request #1 from MLAS1/custom

Bringing back the admin hosts change
Cleanup after merge
further cleanup
Merge pull request #2 from MLAS1/master

a