diff --git a/msi/build/jenkins.wxs b/msi/build/jenkins.wxs
index ed6688e8..40b68fed 100644
--- a/msi/build/jenkins.wxs
+++ b/msi/build/jenkins.wxs
@@ -116,10 +116,11 @@
     </Property>
     <SetProperty After='AppSearch' Id='JENKINS_ROOT' Value='%LocalAppData%\Jenkins\'>NOT JENKINS_ROOT</SetProperty>
 
-    <Property Id="SERVICE_USERNAME">
+    <Property Id="SERVICE_USERNAME" Secure="yes">
       <RegistrySearch Id="DetermineServiceUsername" Type="raw" Root="HKLM" Key="Software\Jenkins\InstalledProducts\Jenkins" Name="SU" Win64="yes" />
     </Property>
-
+    <SetProperty Id="SecureCustomProperties" Value=";SERVICE_PASSWORD" Sequence="first" After="AppSearch" />
+    <SetProperty Id="MsiHiddenProperties" Value="[MsiHiddenProperties];SERVICE_PASSWORD" Sequence="first" After="AppSearch" />
     <Property Id="SERVICE_PASSWORD_ENC">
       <RegistrySearch Id="DetermineServicePassword" Type="raw" Root="HKLM" Key="Software\Jenkins\InstalledProducts\Jenkins" Name="SP" Win64="yes" />
     </Property>