diff --git a/Invoke-Locksmith.ps1 b/Invoke-Locksmith.ps1
index b4aeff68..ec1e12d9 100644
--- a/Invoke-Locksmith.ps1
+++ b/Invoke-Locksmith.ps1
@@ -3202,7 +3202,7 @@ function Set-RiskRating {
             # Default 'User' and 'Machine' templates are more dangerous
             $ESC15 = Find-ESC15 -ADCSObjects $ADCSObjects -SafeUsers $SafeUsers -UnsafeUsers $UnsafeUsers  -SkipRisk |
                 Where-Object { $_.Enabled -eq $true }
-            $ESC15Names = @('Machine', 'User')
+            $ESC15Names = @(($ESC15 | Where-Object Name -In @('Machine', 'User')).Name)
             if ($ESC15Names) {
                 $CheckedESC15Templates = @{}
                 foreach ($name in $ESC15Names) {
diff --git a/Private/Set-RiskRating.ps1 b/Private/Set-RiskRating.ps1
index 19b54f49..d226dbc5 100644
--- a/Private/Set-RiskRating.ps1
+++ b/Private/Set-RiskRating.ps1
@@ -170,7 +170,7 @@ function Set-RiskRating {
             # Default 'User' and 'Machine' templates are more dangerous
             $ESC15 = Find-ESC15 -ADCSObjects $ADCSObjects -SafeUsers $SafeUsers -UnsafeUsers $UnsafeUsers  -SkipRisk |
             Where-Object { $_.Enabled -eq $true }
-            $ESC15Names = @('Machine', 'User')
+            $ESC15Names = @(($ESC15 | Where-Object Name -in @('Machine', 'User')).Name)
             if ($ESC15Names) {
                 $CheckedESC15Templates = @{}
                 foreach ($name in $ESC15Names) {