history fix and Administrator change