Index: ui.wxs
===================================================================
RCS file: /usr/local/cvs/cvsnt/installer/ui.wxs,v
retrieving revision 1.1.2.7.4.42.2.25
diff -c -r1.1.2.7.4.42.2.25 ui.wxs
*** ui.wxs	2 Oct 2024 19:25:27 -0000	1.1.2.7.4.42.2.25
--- ui.wxs	10 Oct 2024 00:19:49 -0000
***************
*** 1415,1421 ****
--- 1415,1425 ----
      <Property Id="REGISTRATION_SERIAL"><![CDATA[0]]></Property>
      <Property Id="CVSMANAGER_PASSWD"><![CDATA[0]]></Property>
      <Property Id="CVSMANAGER_PASSWD2"><![CDATA[$(var.CVSNT_PRODUCT_YEAR)]]></Property>
+ <?if $(var.CVSNT_PRODUCT_YEAR)=2025 ?>
+     <Property Id="CVSNT_USERNAME"><![CDATA[SYSTEM]]></Property>
+ <?else?>
      <Property Id="CVSNT_USERNAME"><![CDATA[CVSMANAGER_USER]]></Property>
+ <?endif?>
      <Property Id="Progress2"><![CDATA[installs]]></Property>
      <Property Id="IAgree"><![CDATA[Yes]]></Property>
  <?if $(var.TESTING)=1 ?>
Index: wizard.wxs
===================================================================
RCS file: /usr/local/cvs/cvsnt/installer/wizard.wxs,v
retrieving revision 1.1.2.11.2.13
diff -c -r1.1.2.11.2.13 wizard.wxs
*** wizard.wxs	1 Feb 2024 00:35:58 -0000	1.1.2.11.2.13
--- wizard.wxs	10 Oct 2024 00:16:44 -0000
***************
*** 3,9 ****
--- 3,11 ----
  <Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'>
  <Fragment Id="wizard">
      <CustomAction Id="WizFirewall" Impersonate="no" FileKey="wizcfg.exe" ExeCommand="/vistafirewall" Execute="deferred" Return="ignore" />
+ <?if $(var.CVSNT_PRODUCT_YEAR)!=2025 ?>
      <CustomAction Id="WizAddRights" Impersonate="no" FileKey="wizcfg.exe" ExeCommand="/a [CVSNT_USERNAME]" Execute="deferred" Return="ignore" />
+ <?endif?>
      <CustomAction Id="WizFixRightClick" Impersonate="no" FileKey="wizcfg.exe" ExeCommand="/2" Execute="deferred" Return="ignore" />
      <CustomAction Id="WizEnableAgent" Impersonate="no" FileKey="wizcfg.exe" ExeCommand='/1 "[#cvsagent.exe]"' Execute="deferred" Return="ignore" />
      <CustomAction Id="WizAgentStart" Impersonate="no" FileKey="wizcfg.exe" ExeCommand='/3 "[#cvsagent.exe]"' Execute="deferred" Return="ignore" />