diff --git a/install/FirefoxAction.CA.dll b/install/FirefoxAction.CA.dll
index d2f47cb0..9ea1ddb1 100644
Binary files a/install/FirefoxAction.CA.dll and b/install/FirefoxAction.CA.dll differ
diff --git a/install/web-eid.wxs b/install/web-eid.wxs
index e93e88bf..b21e262e 100644
--- a/install/web-eid.wxs
+++ b/install/web-eid.wxs
@@ -47,6 +47,8 @@
       BinaryRef="FirefoxAction.CA.dll" DllEntry="ExtensionSettingsRemove" />
     <CustomAction Id="ExtensionSettingsRemove" Return="check" Execute="deferred" Impersonate="no"
       BinaryRef="FirefoxAction.CA.dll" DllEntry="ExtensionSettingsRemove" />
+    <CustomAction Id="ExtensionSettingsUpgrade" Return="check" Execute="deferred" Impersonate="no"
+      BinaryRef="FirefoxAction.CA.dll" DllEntry="ExtensionSettingsFix" />
 
     <CustomAction Id="SetExtensionSettingsForInstall" Property="ExtensionSettingsInstall"
       Value="EXTENSIONSETTINGS_UUID=$(var.FIREFOX_UUID);EXTENSIONSETTINGS_URL=$(var.FIREFOX_URL)" />
@@ -65,6 +67,8 @@
         Condition="NOT (FIREFOXINSTALL=1) AND NOT ((REMOVE=&quot;ALL&quot;) AND (NOT UPGRADINGPRODUCTCODE))" />
       <Custom Action="ExtensionSettingsRemove" Before="InstallFinalize"
         Condition="(REMOVE=&quot;ALL&quot;) AND (NOT UPGRADINGPRODUCTCODE)" />
+      <Custom Action="ExtensionSettingsUpgrade" Before="RemoveExistingProducts"
+        Condition="WIX_UPGRADE_DETECTED" />
     </InstallExecuteSequence>
 
     <StandardDirectory Id="ProgramFiles6432Folder">