diff --git a/it-and-security/lib/windows/configuration-profiles/password.xml b/it-and-security/lib/windows/configuration-profiles/password.xml
index 9e10173783..2e71cc7dd7 100644
--- a/it-and-security/lib/windows/configuration-profiles/password.xml
+++ b/it-and-security/lib/windows/configuration-profiles/password.xml
@@ -6,9 +6,7 @@
       <LocURI>./Device/Vendor/MSFT/Policy/Config/DeviceLock/DevicePasswordEnabled</LocURI>
     </Target>
     <Meta>
-      <Format
-        xmlns="syncml:metinf">int
-      </Format>
+      <Format xmlns="syncml:metinf">int</Format>
     </Meta>
     <Data>1</Data>
   </Item>
@@ -21,9 +19,7 @@
       <LocURI>./Device/Vendor/MSFT/Policy/Config/DeviceLock/MinDevicePasswordLength</LocURI>
     </Target>
     <Meta>
-      <Format
-        xmlns="syncml:metinf">int
-      </Format>
+      <Format xmlns="syncml:metinf">int</Format>
     </Meta>
     <Data>10</Data>
   </Item>
@@ -36,23 +32,21 @@
       <LocURI>./Device/Vendor/MSFT/Policy/Config/DeviceLock/MinDevicePasswordComplexCharacters</LocURI>
     </Target>
     <Meta>
-      <Format
-        xmlns="syncml:metinf">int
-      </Format>
+      <Format xmlns="syncml:metinf">int</Format>
     </Meta>
     <Data>1</Data>
   </Item>
 </Replace>
 <Replace>
   <!-- Enforce screenlock after 15 minutes -->
-  <CmdID>2</CmdID>
+  <CmdID>4</CmdID>
   <Item>
-    <Meta>
-      <Format xmlns="syncml:metinf">int</Format>
-    </Meta>
     <Target>
       <LocURI>./Device/Vendor/MSFT/Policy/Config/DeviceLock/MaxInactivityTimeDeviceLock</LocURI>
     </Target>
+    <Meta>
+      <Format xmlns="syncml:metinf">int</Format>
+    </Meta>
     <Data>15</Data>
   </Item>
 </Replace>