2 files changed, 10 insertions, 10 deletions

diff --git a/src/burn/engine/registration.cpp b/src/burn/engine/registration.cpp
index 7b6aa6bb..961e86bc 100644
--- a/src/burn/engine/registration.cpp
+++ b/src/burn/engine/registration.cpp
@@ -169,10 +169,6 @@ extern "C" HRESULT RegistrationParseFromXml(
 
     if (fFoundXml)
     {
-        // @Register
-        hr = XmlGetYesNoAttribute(pixnArpNode, L"Register", &pRegistration->fRegisterArp);
-        ExitOnRequiredXmlQueryFailure(hr, "Failed to get @Register.");
-
         // @DisplayName
         hr = XmlGetAttributeEx(pixnArpNode, L"DisplayName", &pRegistration->sczDisplayName);
         ExitOnOptionalXmlQueryFailure(hr, fFoundXml, "Failed to get @DisplayName.");
@@ -247,7 +243,12 @@ extern "C" HRESULT RegistrationParseFromXml(
 
         // @DisableRemove
         hr = XmlGetYesNoAttribute(pixnArpNode, L"DisableRemove", &pRegistration->fNoRemove);
-        ExitOnOptionalXmlQueryFailure(hr, pRegistration->fNoRemoveDefined, "Failed to get @DisableRemove.");
+        ExitOnOptionalXmlQueryFailure(hr, fFoundXml, "Failed to get @DisableRemove.");
+    }
+
+    if (pRegistration->fNoRemove && BURN_REGISTRATION_MODIFY_ENABLED != pRegistration->modify)
+    {
+        pRegistration->fForceSystemComponent = TRUE;
     }
 
     hr = ParseSoftwareTagsFromXml(pixnRegistrationNode, &pRegistration->softwareTags.rgSoftwareTags, &pRegistration->softwareTags.cSoftwareTags);
@@ -759,14 +760,14 @@ extern "C" HRESULT RegistrationSessionBegin(
     }
 
     // NoRemove: should this be allowed?
-    if (pRegistration->fNoRemoveDefined)
+    if (pRegistration->fNoRemove)
     {
-        hr = RegWriteNumber(hkRegistration, REGISTRY_BUNDLE_NO_REMOVE, (DWORD)pRegistration->fNoRemove);
+        hr = RegWriteNumber(hkRegistration, REGISTRY_BUNDLE_NO_REMOVE, 1);
         ExitOnFailure(hr, "Failed to write %ls value.", REGISTRY_BUNDLE_NO_REMOVE);
     }
 
     // Conditionally hide the ARP entry.
-    if (!pRegistration->fRegisterArp)
+    if (pRegistration->fForceSystemComponent)
     {
         hr = RegWriteNumber(hkRegistration, REGISTRY_BUNDLE_SYSTEM_COMPONENT, 1);
         ExitOnFailure(hr, "Failed to write %ls value.", REGISTRY_BUNDLE_SYSTEM_COMPONENT);
diff --git a/src/burn/engine/registration.h b/src/burn/engine/registration.h
index 58c883da..c07be962 100644
--- a/src/burn/engine/registration.h
+++ b/src/burn/engine/registration.h
@@ -95,7 +95,7 @@ typedef struct _BURN_SOFTWARE_TAGS
 typedef struct _BURN_REGISTRATION
 {
     BOOL fPerMachine;
-    BOOL fRegisterArp;
+    BOOL fForceSystemComponent;
     BOOL fDisableResume;
     BOOL fCached;
     BOOTSTRAPPER_REGISTRATION_TYPE detectedRegistrationType;
@@ -140,7 +140,6 @@ typedef struct _BURN_REGISTRATION
     LPWSTR sczContact;
     //DWORD64 qwEstimatedSize; // TODO: size should come from disk cost calculation
     BURN_REGISTRATION_MODIFY_TYPE modify;
-    BOOL fNoRemoveDefined;
     BOOL fNoRemove;
 
     BURN_SOFTWARE_TAGS softwareTags;