Merge pull request #1122 from microsoft/4.13.1

4.13.1 release - DEV
microsoft · Jun 27, 2022 · eae8a0d · eae8a0d
2 parents b5b2f94 + 35895c3
commit eae8a0d
Show file tree

Hide file tree

Showing 8 changed files with 85 additions and 80 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## [Unreleased]
 
+## [4.13.1] - 2022-06-27
+
+* Fixed:Split-BenchmarkId returns the wrong value for Windows Defender V2R4 [#1121](https://github.com/microsoft/PowerStig/issues/1121)
+* Fixed: Add Org Default Settings to 2019/2016 [#1120](https://github.com/microsoft/PowerStig/issues/1120)
+
 ## [4.13.0] - 2022-06-16
 
 * Update PowerSTIG to successfully parse/apply Microsoft Windows 10 STIG - Ver 2, Rel 4: [#1096](https://github.com/microsoft/PowerStig/issues/1096)

diff --git a/FILEHASH.md b/FILEHASH.md
@@ -1,4 +1,4 @@
-# PowerSTIG File Hashes : Module Version 4.13.0
+# PowerSTIG File Hashes : Module Version 4.13.1
 
 Hashes for **PowerSTIG** files are listed in the following table:
 
@@ -140,13 +140,13 @@ Hashes for **PowerSTIG** files are listed in the following table:
 | WindowsServer-2016-DC-2.4.xml | EDF85CE6C569B0B8998BACCB597ABF951A34A4AC619870080636B5CC19AF5DEF | 559501 |
 | WindowsServer-2016-MS-2.3.org.default.xml | 92A5B6A814BCA1898550FC1C96CC736AC93F93631371AE9DAD27FE16789CA122 | 4783 |
 | WindowsServer-2016-MS-2.3.xml | A875C4D17CCC60382C6992E5B9211E52772527B04C7770C1A9CDE59D20D9C310 | 483497 |
-| WindowsServer-2016-MS-2.4.org.default.xml | 6C829B576D26396FB99096BDF70B632870DCA7B111E1A4FC07BC0A787A75489B | 4483 |
+| WindowsServer-2016-MS-2.4.org.default.xml | 47D1FD77A3C7A7745434A49F02AE40528F1C5293D98AA896FF4C25F96989BC62 | 4658 |
 | WindowsServer-2016-MS-2.4.xml | D5A94837139D649D9C16C3A694707C45D7049CA755898FD4CA1905CBB98FA6B9 | 481890 |
 | WindowsServer-2019-DC-2.3.org.default.xml | 78D219011E04454BEC2E33FD09587D56451E3FB23980C45E2683E56BB704A799 | 4770 |
 | WindowsServer-2019-DC-2.3.xml | 72B8873DF8FACA7B64D721EF682FBFD36ABE4C07DBEAB2CEF1B7A96D33B5BA81 | 567757 |
-| WindowsServer-2019-DC-2.4.org.default.xml | 727FF5C529D2A02F143BCE784F5E84C6486EFEC71FA003A53255218F841C1F01 | 4556 |
+| WindowsServer-2019-DC-2.4.org.default.xml | 0FFF6322B84203D52089B001D7B9396D409F26926A26F97009B0EAB39AD71CF2 | 4645 |
 | WindowsServer-2019-DC-2.4.xml | E6FC6512DB974FA3DB197F95E17CB3072F5DD5175A8C697DB56F6DB10AA31D4B | 566108 |
 | WindowsServer-2019-MS-2.3.org.default.xml | 35EDE14E7F5FF8A9ADBBED71495A6690C34FE97B9117C6C921C3304499391D7C | 4702 |
 | WindowsServer-2019-MS-2.3.xml | 6832A6911A864FC10BF1E74DC4DB8DDE0E5CF3126BA36882C7410CC813D5F731 | 489612 |
-| WindowsServer-2019-MS-2.4.org.default.xml | 3822A1EB673665BFDF2677F7F713D5038CFEA12F19BFC7CB9CB372770D3B40CF | 4407 |
+| WindowsServer-2019-MS-2.4.org.default.xml | C3ACE15968F7C6BB8EDCB7AE0F952B20B186A474819ACD87870D78624B333F7F | 4577 |
 | WindowsServer-2019-MS-2.4.xml | DA5608CD7247EE14EE552DCD67E0F9FEEBFB79B61F632251BB1EA53DFD71002D | 488029 |
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,5 +1,5 @@
 mode: ContinuousDelivery
-next-version: 4.12.0
+next-version: 4.13.1
 major-version-bump-message: '\s?(breaking|major|breaking\schange)'
 minor-version-bump-message: '\s?(add|feature|minor)'
 patch-version-bump-message: '\s?(fix|patch)'

diff --git a/source/Module/Common/Functions.XccdfXml.ps1 b/source/Module/Common/Functions.XccdfXml.ps1
@@ -390,7 +390,7 @@ function Split-BenchmarkId
             $returnId = 'WindowsFirewall_All'
             continue
         }
-        {$PSItem -match "Windows_Defender_Antivirus"}
+        {$PSItem -match "Windows_Defender_Antivirus|MS_Defender_Antivirus"}
         {
             $returnId = 'WindowsDefender_All'
             continue

diff --git a/source/PowerStig.psd1 b/source/PowerStig.psd1
@@ -6,7 +6,7 @@
     RootModule = 'PowerStig.psm1'
 
     # Version number of this module.
-    ModuleVersion = '4.13.0'
+    ModuleVersion = '4.13.1'
 
     # ID used to uniquely identify this module
     GUID = 'a132f6a5-8f96-4942-be25-b213ee7e4af3'

diff --git a/source/StigData/Processed/WindowsServer-2016-MS-2.4.org.default.xml b/source/StigData/Processed/WindowsServer-2016-MS-2.4.org.default.xml
@@ -7,29 +7,29 @@
 -->
 <OrganizationalSettings fullversion="2.4">
   <!-- Ensure ''V-224923.b'' -match '1|3'-->
-  <OrganizationalSetting id="V-224923.b" ValueData="" />
+  <OrganizationalSetting id="V-224923.b" ValueData="1" />
   <!-- Ensure ''V-224924'' -match '1|3|8|ShouldBeAbsent'-->
-  <OrganizationalSetting id="V-224924" ValueData="" />
+  <OrganizationalSetting id="V-224924" ValueData="8" />
   <!-- Ensure ''V-224936'' -match '0|1'-->
-  <OrganizationalSetting id="V-224936" ValueData="" />
+  <OrganizationalSetting id="V-224936" ValueData="0" />
   <!-- Ensure ''V-224937'' -ge '32768'-->
-  <OrganizationalSetting id="V-224937" ValueData="" />
+  <OrganizationalSetting id="V-224937" ValueData="32768" />
   <!-- Ensure ''V-224938'' -ge '196608'-->
-  <OrganizationalSetting id="V-224938" ValueData="" />
+  <OrganizationalSetting id="V-224938" ValueData="196608" />
   <!-- Ensure ''V-224939'' -ge '32768'-->
-  <OrganizationalSetting id="V-224939" ValueData="" />
+  <OrganizationalSetting id="V-224939" ValueData="32768" />
   <!-- Ensure ''V-224941'' -match '0|ShouldBeAbsent'-->
-  <OrganizationalSetting id="V-224941" ValueData="" />
+  <OrganizationalSetting id="V-224941" ValueData="0" />
   <!-- Ensure ''V-224942'' -match '0|ShouldBeAbsent'-->
-  <OrganizationalSetting id="V-224942" ValueData="" />
+  <OrganizationalSetting id="V-224942" ValueData="0" />
   <!-- Ensure ''V-224943'' -match '0|ShouldBeAbsent'-->
-  <OrganizationalSetting id="V-224943" ValueData="" />
+  <OrganizationalSetting id="V-224943" ValueData="0" />
   <!-- Ensure ''V-224951'' -match '0|ShouldBeAbsent'-->
-  <OrganizationalSetting id="V-224951" ValueData="" />
+  <OrganizationalSetting id="V-224951" ValueData="0" />
   <!-- Ensure ''V-224955'' -match '0|ShouldBeAbsent'-->
-  <OrganizationalSetting id="V-224955" ValueData="" />
+  <OrganizationalSetting id="V-224955" ValueData="0" />
   <!-- Ensure ''V-225011'' -le '4'-->
-  <OrganizationalSetting id="V-225011" ValueData="" />
+  <OrganizationalSetting id="V-225011" ValueData="4" />
   <!-- Ensure location for DoD Root CA 3 certificate is present-->
   <OrganizationalSetting id="V-225021.a" Location="" />
   <!-- Ensure location for DoD Root CA 4 certificate is present-->
@@ -43,37 +43,37 @@
   <!-- Ensure location for US DoD CCEB Interoperability Root CA 2 certificate is present-->
   <OrganizationalSetting id="V-225023" Location="" />
   <!-- Ensure ''V-225033'' -le '30' -and ''V-225033'' -gt '0'-->
-  <OrganizationalSetting id="V-225033" ValueData="" />
+  <OrganizationalSetting id="V-225033" ValueData="30" />
   <!-- Ensure ''V-225035'' -le '900' -and ''V-225035'' -gt '0'-->
-  <OrganizationalSetting id="V-225035" ValueData="" />
+  <OrganizationalSetting id="V-225035" ValueData="900" />
   <!-- Ensure ''V-225037'' -match '^(DoD Notice and Consent Banner|US Department of Defense Warning Statement)$'-->
-  <OrganizationalSetting id="V-225037" ValueData="" />
+  <OrganizationalSetting id="V-225037" ValueData="DoD Notice and Consent Banner" />
   <!-- Ensure ''V-225038'' -match '1|2'-->
-  <OrganizationalSetting id="V-225038" ValueData="" />
+  <OrganizationalSetting id="V-225038" ValueData="1" />
   <!-- Ensure ''V-225063'' -match '1|2'-->
-  <OrganizationalSetting id="V-225063" ValueData="" />
+  <OrganizationalSetting id="V-225063" ValueData="1" />
   <!-- Ensure ''V-225069'' -match '2|ShouldBeAbsent'-->
-  <OrganizationalSetting id="V-225069" ValueData="" />
+  <OrganizationalSetting id="V-225069" ValueData="2" />
   <!-- Ensure ''V-224866'' -ge '15' -or ''V-224866'' -eq '0'-->
-  <OrganizationalSetting id="V-224866" PolicyValue="" />
+  <OrganizationalSetting id="V-224866" PolicyValue="15" />
   <!-- Ensure ''V-224867'' -le '3' -and ''V-224867'' -ne '0'-->
-  <OrganizationalSetting id="V-224867" PolicyValue="" />
+  <OrganizationalSetting id="V-224867" PolicyValue="3" />
   <!-- Ensure ''V-224868'' -ge '15'-->
-  <OrganizationalSetting id="V-224868" PolicyValue="" />
+  <OrganizationalSetting id="V-224868" PolicyValue="15" />
   <!-- Ensure ''V-224869'' -ge '24'-->
-  <OrganizationalSetting id="V-224869" PolicyValue="" />
+  <OrganizationalSetting id="V-224869" PolicyValue="24" />
   <!-- Ensure ''V-224870'' -le '60' -and ''V-224870'' -ne '0'-->
-  <OrganizationalSetting id="V-224870" PolicyValue="" />
+  <OrganizationalSetting id="V-224870" PolicyValue="60" />
   <!-- Ensure ''V-224871'' -ne '0'-->
-  <OrganizationalSetting id="V-224871" PolicyValue="" />
+  <OrganizationalSetting id="V-224871" PolicyValue="1" />
   <!-- Ensure ''V-224872'' -ge '14'-->
-  <OrganizationalSetting id="V-224872" PolicyValue="" />
+  <OrganizationalSetting id="V-224872" PolicyValue="14" />
   <!-- Ensure ''V-225015'' -match 'Enterprise Admins,Domain Admins,(Local account and member of Administrators group|Local account),Guests'-->
-  <OrganizationalSetting id="V-225015" Identity="" />
+  <OrganizationalSetting id="V-225015" Identity="Enterprise Admins,Domain Admins,Local account and member of Administrators group,Guests" />
   <!-- Ensure ''V-225026'' -ne 'Administrator'-->
   <OrganizationalSetting id="V-225026" OptionValue="" />
   <!-- Ensure ''V-225027'' -ne 'Guest'-->
   <OrganizationalSetting id="V-225027" OptionValue="" />
   <!-- Ensure ''V-225078'' -match '^(Administrators,NT Virtual Machine\\Virtual Machines|Administrators)$'-->
-  <OrganizationalSetting id="V-225078" Identity="" />
+  <OrganizationalSetting id="V-225078" Identity="Administrators" />
 </OrganizationalSettings>
diff --git a/source/StigData/Processed/WindowsServer-2019-DC-2.4.org.default.xml b/source/StigData/Processed/WindowsServer-2019-DC-2.4.org.default.xml
@@ -7,9 +7,9 @@
 -->
 <OrganizationalSettings fullversion="2.4">
   <!-- Ensure ''V-205632'' -match '^(DoD Notice and Consent Banner|US Department of Defense Warning Statement)$'-->
-  <OrganizationalSetting id="V-205632" ValueData="" />
+  <OrganizationalSetting id="V-205632" ValueData="DoD Notice and Consent Banner" />
   <!-- Ensure ''V-205633'' -le '900' -and ''V-205633'' -gt '0'-->
-  <OrganizationalSetting id="V-205633" ValueData="" />
+  <OrganizationalSetting id="V-205633" ValueData="900" />
   <!-- Ensure location for DoD Root CA 3 certificate is present-->
   <OrganizationalSetting id="V-205648.a" Location="" />
   <!-- Ensure location for DoD Root CA 4 certificate is present-->
@@ -25,53 +25,53 @@
   <!-- Ensure location for US DoD CCEB Interoperability Root CA 2 certificate is present-->
   <OrganizationalSetting id="V-205650.b" Location="" />
   <!-- Ensure ''V-205703'' -le '600' -and ''V-205703'' -ne '0'-->
-  <OrganizationalSetting id="V-205703" PolicyValue="" />
+  <OrganizationalSetting id="V-205703" PolicyValue="600" />
   <!-- Ensure ''V-205704'' -le '10' -and ''V-205704'' -ne '0'-->
-  <OrganizationalSetting id="V-205704" PolicyValue="" />
+  <OrganizationalSetting id="V-205704" PolicyValue="10" />
   <!-- Ensure ''V-205705'' -le '7'-->
-  <OrganizationalSetting id="V-205705" PolicyValue="" />
+  <OrganizationalSetting id="V-205705" PolicyValue="7" />
   <!-- Ensure ''V-205706'' -le '5'-->
-  <OrganizationalSetting id="V-205706" PolicyValue="" />
+  <OrganizationalSetting id="V-205706" PolicyValue="5" />
   <!-- Ensure ''V-205717'' -match '1|2'-->
-  <OrganizationalSetting id="V-205717" ValueData="" />
+  <OrganizationalSetting id="V-205717" ValueData="1" />
   <!-- Ensure ''V-205796'' -ge '32768'-->
-  <OrganizationalSetting id="V-205796" ValueData="" />
+  <OrganizationalSetting id="V-205796" ValueData="32768" />
   <!-- Ensure ''V-205797'' -ge '196608'-->
-  <OrganizationalSetting id="V-205797" ValueData="" />
+  <OrganizationalSetting id="V-205797" ValueData="196608" />
   <!-- Ensure ''V-205798'' -ge '32768'-->
-  <OrganizationalSetting id="V-205798" ValueData="" />
+  <OrganizationalSetting id="V-205798" ValueData="32768" />
   <!-- Ensure ServiceName/StartupType is populated with correct AntiVirus service information-->
   <OrganizationalSetting id="V-205850" ServiceName="" StartupType="" />
   <!-- Ensure ''V-205864.b'' -match '1|3'-->
-  <OrganizationalSetting id="V-205864.b" ValueData="" />
+  <OrganizationalSetting id="V-205864.b" ValueData="1" />
   <!-- Ensure ''V-205865'' -match '1|3|8|ShouldBeAbsent'-->
-  <OrganizationalSetting id="V-205865" ValueData="" />
+  <OrganizationalSetting id="V-205865" ValueData="8" />
   <!-- Ensure ''V-205869'' -match '0|1'-->
-  <OrganizationalSetting id="V-205869" ValueData="" />
+  <OrganizationalSetting id="V-205869" ValueData="0" />
   <!-- Ensure ''V-205870'' -match '0|1|2|99|100'-->
-  <OrganizationalSetting id="V-205870" ValueData="" />
+  <OrganizationalSetting id="V-205870" ValueData="0" />
   <!-- Ensure ''V-205911'' -le '30' -and ''V-205911'' -gt '0'-->
-  <OrganizationalSetting id="V-205911" ValueData="" />
+  <OrganizationalSetting id="V-205911" ValueData="30" />
   <!-- Ensure ''V-205912'' -match '1|2'-->
-  <OrganizationalSetting id="V-205912" ValueData="" />
+  <OrganizationalSetting id="V-205912" ValueData="1" />
   <!-- Ensure ServiceName/StartupType is populated with correct Firewall service information-->
   <OrganizationalSetting id="V-214936" ServiceName="" StartupType="" />
   <!-- Ensure ''V-205629'' -le '3' -and ''V-205629'' -ne '0'-->
-  <OrganizationalSetting id="V-205629" PolicyValue="" />
+  <OrganizationalSetting id="V-205629" PolicyValue="3" />
   <!-- Ensure ''V-205630'' -ge '15'-->
-  <OrganizationalSetting id="V-205630" PolicyValue="" />
+  <OrganizationalSetting id="V-205630" PolicyValue="15" />
   <!-- Ensure ''V-205656'' -ne '0'-->
-  <OrganizationalSetting id="V-205656" PolicyValue="" />
+  <OrganizationalSetting id="V-205656" PolicyValue="1" />
   <!-- Ensure ''V-205659'' -le '60' -and ''V-205659'' -ne '0'-->
-  <OrganizationalSetting id="V-205659" PolicyValue="" />
+  <OrganizationalSetting id="V-205659" PolicyValue="60" />
   <!-- Ensure ''V-205660'' -ge '24'-->
-  <OrganizationalSetting id="V-205660" PolicyValue="" />
+  <OrganizationalSetting id="V-205660" PolicyValue="24" />
   <!-- Ensure ''V-205662'' -ge '14'-->
-  <OrganizationalSetting id="V-205662" PolicyValue="" />
+  <OrganizationalSetting id="V-205662" PolicyValue="14" />
   <!-- Ensure ''V-205756'' -match '^(Administrators,NT Virtual Machine\\Virtual Machines|Administrators)$'-->
-  <OrganizationalSetting id="V-205756" Identity="" />
+  <OrganizationalSetting id="V-205756" Identity="Administrators" />
   <!-- Ensure ''V-205795'' -ge '15' -or ''V-205795'' -eq '0'-->
-  <OrganizationalSetting id="V-205795" PolicyValue="" />
+  <OrganizationalSetting id="V-205795" PolicyValue="15" />
   <!-- Ensure ''V-205909'' -ne 'Administrator'-->
   <OrganizationalSetting id="V-205909" OptionValue="" />
   <!-- Ensure ''V-205910'' -ne 'Guest'-->

diff --git a/source/StigData/Processed/WindowsServer-2019-MS-2.4.org.default.xml b/source/StigData/Processed/WindowsServer-2019-MS-2.4.org.default.xml
@@ -7,9 +7,9 @@
 -->
 <OrganizationalSettings fullversion="2.4">
   <!-- Ensure ''V-205632'' -match '^(DoD Notice and Consent Banner|US Department of Defense Warning Statement)$'-->
-  <OrganizationalSetting id="V-205632" ValueData="" />
+  <OrganizationalSetting id="V-205632" ValueData="DoD Notice and Consent Banner" />
   <!-- Ensure ''V-205633'' -le '900' -and ''V-205633'' -gt '0'-->
-  <OrganizationalSetting id="V-205633" ValueData="" />
+  <OrganizationalSetting id="V-205633" ValueData="900" />
   <!-- Ensure location for DoD Root CA 3 certificate is present-->
   <OrganizationalSetting id="V-205648.a" Location="" />
   <!-- Ensure location for DoD Root CA 4 certificate is present-->
@@ -25,49 +25,49 @@
   <!-- Ensure location for US DoD CCEB Interoperability Root CA 2 certificate is present-->
   <OrganizationalSetting id="V-205650.b" Location="" />
   <!-- Ensure ''V-205717'' -match '1|2'-->
-  <OrganizationalSetting id="V-205717" ValueData="" />
+  <OrganizationalSetting id="V-205717" ValueData="1" />
   <!-- Ensure ''V-205796'' -ge '32768'-->
-  <OrganizationalSetting id="V-205796" ValueData="" />
+  <OrganizationalSetting id="V-205796" ValueData="32768" />
   <!-- Ensure ''V-205797'' -ge '196608'-->
-  <OrganizationalSetting id="V-205797" ValueData="" />
+  <OrganizationalSetting id="V-205797" ValueData="196608" />
   <!-- Ensure ''V-205798'' -ge '32768'-->
-  <OrganizationalSetting id="V-205798" ValueData="" />
+  <OrganizationalSetting id="V-205798" ValueData="32768" />
   <!-- Ensure ServiceName/StartupType is populated with correct AntiVirus service information-->
   <OrganizationalSetting id="V-205850" ServiceName="" StartupType="" />
   <!-- Ensure ''V-205864.b'' -match '1|3'-->
-  <OrganizationalSetting id="V-205864.b" ValueData="" />
+  <OrganizationalSetting id="V-205864.b" ValueData="1" />
   <!-- Ensure ''V-205865'' -match '1|3|8|ShouldBeAbsent'-->
-  <OrganizationalSetting id="V-205865" ValueData="" />
+  <OrganizationalSetting id="V-205865" ValueData="8" />
   <!-- Ensure ''V-205869'' -match '0|1'-->
-  <OrganizationalSetting id="V-205869" ValueData="" />
+  <OrganizationalSetting id="V-205869" ValueData="0" />
   <!-- Ensure ''V-205870'' -match '0|1|2|99|100'-->
-  <OrganizationalSetting id="V-205870" ValueData="" />
+  <OrganizationalSetting id="V-205870" ValueData="0" />
   <!-- Ensure ''V-205906'' -le '4'-->
-  <OrganizationalSetting id="V-205906" ValueData="" />
+  <OrganizationalSetting id="V-205906" ValueData="4" />
   <!-- Ensure ''V-205911'' -le '30' -and ''V-205911'' -gt '0'-->
-  <OrganizationalSetting id="V-205911" ValueData="" />
+  <OrganizationalSetting id="V-205911" ValueData="30" />
   <!-- Ensure ''V-205912'' -match '1|2'-->
-  <OrganizationalSetting id="V-205912" ValueData="" />
+  <OrganizationalSetting id="V-205912" ValueData="1" />
   <!-- Ensure ServiceName/StartupType is populated with correct Firewall service information-->
   <OrganizationalSetting id="V-214936" ServiceName="" StartupType="" />
   <!-- Ensure ''V-205629'' -le '3' -and ''V-205629'' -ne '0'-->
-  <OrganizationalSetting id="V-205629" PolicyValue="" />
+  <OrganizationalSetting id="V-205629" PolicyValue="3" />
   <!-- Ensure ''V-205630'' -ge '15'-->
-  <OrganizationalSetting id="V-205630" PolicyValue="" />
+  <OrganizationalSetting id="V-205630" PolicyValue="15" />
   <!-- Ensure ''V-205656'' -ne '0'-->
-  <OrganizationalSetting id="V-205656" PolicyValue="" />
+  <OrganizationalSetting id="V-205656" PolicyValue="1" />
   <!-- Ensure ''V-205659'' -le '60' -and ''V-205659'' -ne '0'-->
-  <OrganizationalSetting id="V-205659" PolicyValue="" />
+  <OrganizationalSetting id="V-205659" PolicyValue="60" />
   <!-- Ensure ''V-205660'' -ge '24'-->
-  <OrganizationalSetting id="V-205660" PolicyValue="" />
+  <OrganizationalSetting id="V-205660" PolicyValue="24" />
   <!-- Ensure ''V-205662'' -ge '14'-->
-  <OrganizationalSetting id="V-205662" PolicyValue="" />
+  <OrganizationalSetting id="V-205662" PolicyValue="14" />
   <!-- Ensure ''V-205672'' -match 'Enterprise Admins,Domain Admins,(Local account and member of Administrators group|Local account),Guests'-->
-  <OrganizationalSetting id="V-205672" Identity="" />
+  <OrganizationalSetting id="V-205672" Identity="Enterprise Admins,Domain Admins,Local account and member of Administrators group,Guests" />
   <!-- Ensure ''V-205756'' -match '^(Administrators,NT Virtual Machine\\Virtual Machines|Administrators)$'-->
-  <OrganizationalSetting id="V-205756" Identity="" />
+  <OrganizationalSetting id="V-205756" Identity="Administrators" />
   <!-- Ensure ''V-205795'' -ge '15' -or ''V-205795'' -eq '0'-->
-  <OrganizationalSetting id="V-205795" PolicyValue="" />
+  <OrganizationalSetting id="V-205795" PolicyValue="15" />
   <!-- Ensure ''V-205909'' -ne 'Administrator'-->
   <OrganizationalSetting id="V-205909" OptionValue="" />
   <!-- Ensure ''V-205910'' -ne 'Guest'-->