ensure location and owner are correctly disabled, even when updating