Checking in validation for admin tools

fixes issue #359