diff --git a/rpm/SPECS/crowdsec.spec b/rpm/SPECS/crowdsec.spec
index 557ec405c..759ec2000 100644
--- a/rpm/SPECS/crowdsec.spec
+++ b/rpm/SPECS/crowdsec.spec
@@ -171,15 +171,17 @@ if [ $1 == 1 ]; then
         install -m 600 /dev/null %{_sysconfdir}/crowdsec/online_api_credentials.yaml
         install -m 600 /dev/null %{_sysconfdir}/crowdsec/local_api_credentials.yaml
         cscli capi register
-        [ -s "%{_sysconfdir}/crowdsec/local_api_credentials.yaml" ] || cscli machines add -a
+        [ -s "%{_sysconfdir}/crowdsec/local_api_credentials.yaml" ] || cscli machines add -a --force
     fi
     if [ ! -f "%{_sysconfdir}/crowdsec/online_api_credentials.yaml" ] ; then
         touch %{_sysconfdir}/crowdsec/online_api_credentials.yaml
+        chmod 600 %{_sysconfdir}/crowdsec/online_api_credentials.yaml
         cscli capi register
     fi
     if [ ! -f "%{_sysconfdir}/crowdsec/local_api_credentials.yaml" ] ; then
         touch %{_sysconfdir}/crowdsec/local_api_credentials.yaml
-        cscli machines add -a
+        chmod 600 %{_sysconfdir}/crowdsec/local_api_credentials.yaml
+        [ -s "%{_sysconfdir}/crowdsec/local_api_credentials.yaml" ] || cscli machines add -a --force
     fi
 
     cscli hub update
diff --git a/windows/installer/product.wxs b/windows/installer/product.wxs
index fed814776..a0c1ea11e 100644
--- a/windows/installer/product.wxs
+++ b/windows/installer/product.wxs
@@ -143,7 +143,7 @@
       <CustomAction Id="FixPermissionsCreds" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Return="check" Impersonate="no" />
       <SetProperty Id="FixPermissionsNotif" Value="&quot;icacls.exe&quot; C:\ProgramData\CrowdSec\config\notifications\*.yaml /inheritance:r /grant:r *S-1-5-32-544:(F)" Sequence="execute" Before="FixPermissionsNotif" />
       <CustomAction Id="FixPermissionsNotif" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Return="check" Impersonate="no" />
-      <SetProperty Id="RegisterMachine" Value="&quot;[INSTALLDIR]\cscli.exe&quot; machines add -a -f" Sequence="execute" Before="RegisterMachine" />
+      <SetProperty Id="RegisterMachine" Value="&quot;[INSTALLDIR]\cscli.exe&quot; machines add -a --force" Sequence="execute" Before="RegisterMachine" />
       <CustomAction Id="RegisterMachine" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" />
       <SetProperty Id="RegisterCAPI" Value="&quot;[INSTALLDIR]\cscli.exe&quot; capi register" Sequence="execute" Before="RegisterMachine" />
       <CustomAction Id="RegisterCAPI" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" />