admin handling improvements