Small changes to admin-cli

Fixed up some of my poor logic.