diff --git a/HyperlinkSidebarTheme.xml b/HyperlinkSidebarTheme.xml
index de132ab..14edc0a 100644
--- a/HyperlinkSidebarTheme.xml
+++ b/HyperlinkSidebarTheme.xml
@@ -60,13 +60,13 @@
             <Checkbox Name="Qdigidoc4Install" X="30" Y="124" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.qdigidoc4)</Checkbox>
             <Static X="30" Y="143" Width="-30" Height="1" />
             <Checkbox Name="ChromeSupport" X="30" Y="146" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.chromeplugin)</Checkbox>
-            <Checkbox Name="ForceChromeExtensionActivation2" X="30" Y="168" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.chromepluginpolicy)</Checkbox>
+            <Checkbox Name="ForceChromeExtensionActivation2" X="30" Y="168" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="ChromeSupport">#(loc.chromepluginpolicy)</Checkbox>
             <Checkbox Name="EdgeSupport" X="30" Y="190" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.edgeplugin)</Checkbox>
-            <Checkbox Name="ForceEdgeExtensionActivation2" X="30" Y="212" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.edgepluginpolicy)</Checkbox>
+            <Checkbox Name="ForceEdgeExtensionActivation2" X="30" Y="212" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="EdgeSupport">#(loc.edgepluginpolicy)</Checkbox>
             <Checkbox Name="FirefoxSupport" X="30" Y="234" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.firefoxplugin)</Checkbox>
             <Static X="30" Y="258" Width="-30" Height="1" />
             <Checkbox Name="IconsDesktop" X="30" Y="261" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="Qdigidoc4Install">#(loc.OptionsDesktop)</Checkbox>
-            <Checkbox Name="InstallCertSynchronizer" X="30" Y="283" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.certsynchronizer)</Checkbox>
+            <Checkbox Name="InstallCertSynchronizer" X="30" Y="283" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="MinidriverInstall">#(loc.certsynchronizer)</Checkbox>
             <Button Name="OptionsOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">
                 <Text>#(loc.OptionsOkButton)</Text>
                 <ChangePageAction Page="Install" />
diff --git a/bootstrapper.wxs b/bootstrapper.wxs
index 7ea329b..2210c50 100644
--- a/bootstrapper.wxs
+++ b/bootstrapper.wxs
@@ -40,6 +40,8 @@
       Key="SOFTWARE\Mozilla\NativeMessagingHosts\eu.webeid" Bitness="always64" After="OpenEID_Installed" />
     <util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="MinidriverInstall" Variable="MinidriverInstallExists" Result="exists" Id="MinidriverInstallExists" />
     <util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="MinidriverInstall" Variable="MinidriverInstall" Condition="MinidriverInstallExists" After="MinidriverInstallExists" />
+    <util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="InstallCertSynchronizer" Variable="InstallCertSynchronizerExists" Result="exists" Id="InstallCertSynchronizerExists" />
+    <util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="InstallCertSynchronizer" Variable="InstallCertSynchronizer" Condition="InstallCertSynchronizerExists" After="InstallCertSynchronizerExists" />
     <util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="Qdigidoc4Install" Variable="Qdigidoc4InstallExists" Result="exists" Id="Qdigidoc4InstallExists" />
     <util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="Qdigidoc4Install" Variable="Qdigidoc4Install" Condition="Qdigidoc4InstallExists" After="Qdigidoc4InstallExists" />
     <util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="AutoUpdate" Variable="AutoUpdateExists" Result="exists" Id="AutoUpdateExists" />
@@ -110,6 +112,7 @@
         <MsiProperty Name="Qdigidoc4Install" Value="[Qdigidoc4Install]" />
         <MsiProperty Name="AutoUpdate" Value="[AutoUpdate]" />
         <MsiProperty Name="IconsDesktop" Value="[IconsDesktop]" />
+        <MsiProperty Name="InstallCertSynchronizer" Value="[InstallCertSynchronizer]" />
       </MsiPackage>
     </Chain>
   </Bundle>
diff --git a/metainfo.wxs b/metainfo.wxs
index 30738af..bdcca7e 100644
--- a/metainfo.wxs
+++ b/metainfo.wxs
@@ -7,6 +7,7 @@
     <Property Id="QDIGIDOC4INSTALL" Value="0" />
     <Property Id="AUTOUPDATE" Value="0" />
     <Property Id="ICONSDESKTOP" Value="0" />
+    <Property Id="INSTALLCERTSYNCHRONIZER" Value="0" />
 
     <Component Id="Content" Directory="TARGETDIR" Transitive="yes">
       <RegistryValue Root="HKMU" Key="SOFTWARE\[Manufacturer]\Open-EID"
@@ -17,6 +18,8 @@
                      Name="AutoUpdate" Value="[AUTOUPDATE]" Type="integer" />
       <RegistryValue Root="HKMU" Key="SOFTWARE\[Manufacturer]\Open-EID"
                      Name="IconsDesktop" Value="[ICONSDESKTOP]" Type="integer" />
+      <RegistryValue Root="HKMU" Key="SOFTWARE\[Manufacturer]\Open-EID"
+                     Name="InstallCertSynchronizer" Value="[INSTALLCERTSYNCHRONIZER]" Type="integer" />
       <ServiceControl Id="ControlCertPropSvcStop" Name="CertPropSvc" Stop="install" Wait="yes" />
       <ServiceControl Id="ControlCertPropSvcStart" Name="CertPropSvc" Start="install" Wait="no" />
     </Component>