Make sure the Admin Id is preserved