diff --git a/JamiInstaller/Config.wxi b/JamiInstaller/Config.wxi
index 8f83ebb1e29bb4c955253fe30447e87e843c2e14..f24ee3ff2a76444a61c4d479aac7bdfafe02f96f 100644
--- a/JamiInstaller/Config.wxi
+++ b/JamiInstaller/Config.wxi
@@ -12,7 +12,7 @@
     <?define ReleaseDir="..\x64\Beta"?>
     <?endif ?>
 
-    <?define FolderName="Jami" ?>
+    <?define AppName="Jami" ?>
 
     <?define Manufacturer="Savoir-Faire Linux"?>
     <?define UcrtDir="C:\Program Files (x86)\Windows Kits\10\Redist\ucrt\DLLs\x64"?>
diff --git a/JamiInstaller/Product.wxs b/JamiInstaller/Product.wxs
index ce4121ed5c6a715eb4b8965d20eda21eac2f336b..b8a9f1124787dbf9f2397a0a06777eeda38244e9 100644
--- a/JamiInstaller/Product.wxs
+++ b/JamiInstaller/Product.wxs
@@ -75,11 +75,7 @@
   <Fragment Id="OtherRegistryEntries">
     <DirectoryRef Id="TARGETDIR">
       <Component Id="RegistryEntries" Guid="*" Win64="yes">
-          <RegistryKey Root="HKCU"
-                     Key="Software\jami.net\$(var.Name)"
-                     Action="createAndRemoveOnUninstall">
-              <RegistryValue Type="integer" Name="hasRun" Value="0" KeyPath="yes" Action='write'/>
-          </RegistryKey>
+          <RegistryValue Root="HKCU" Key="Software\jami.net\$(var.AppName)" Name="hasRun" Type="integer" Value="0" KeyPath="yes" />
       </Component>
     </DirectoryRef>
   </Fragment>
@@ -89,7 +85,7 @@
       <Property Id="WixAppFolder" Value="WixPerMachineFolder" />
 
       <!--APPLICATIONFOLDER required by WixUI_Advanced, ApplicationFolderName reset APPLICATIONFOLDER path-->
-      <Property Id="ApplicationFolderName" Value="$(var.Manufacturer)\$(var.FolderName)" />
+      <Property Id="ApplicationFolderName" Value="$(var.Manufacturer)\$(var.AppName)" />
       <UIRef Id="WixUI_Advanced" />
 
       <!--Remove User Exit Dialog-->