Make admin config options more robust

Signed-off-by: Tony Butler <tonyjbutler@gmail.com>