From 2430605a23fabe392a902ff52fa4ef058f7d11d9 Mon Sep 17 00:00:00 2001
From: zoicware <118035521+zoicware@users.noreply.github.com>
Date: Sun, 30 Nov 2025 01:41:34 -0500
Subject: [PATCH] fix error when executionpolicy is set via settings page fix
 #54

---
 RemoveWindowsAi.ps1 | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/RemoveWindowsAi.ps1 b/RemoveWindowsAi.ps1
index ce4dcc7..8abb67f 100644
--- a/RemoveWindowsAi.ps1
+++ b/RemoveWindowsAi.ps1
@@ -961,10 +961,20 @@ foreach ($choice in $aipackages) {
             Set-ExecutionPolicy Unrestricted -Force -ErrorAction Stop
         }
         catch {
-            #user has set powershell execution policy via group policy, to change it we need to update the registry 
-            $Global:ogExecutionPolicy = Get-ItemPropertyValue -Path 'HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell' -Name 'ExecutionPolicy' -ErrorAction SilentlyContinue
-            Reg.exe add 'HKLM\SOFTWARE\Policies\Microsoft\Windows\PowerShell' /v 'EnableScripts' /t REG_DWORD /d '1' /f >$null
-            Reg.exe add 'HKLM\SOFTWARE\Policies\Microsoft\Windows\PowerShell' /v 'ExecutionPolicy' /t REG_SZ /d 'Unrestricted' /f >$null
+            #user has set powershell execution policy via group policy or via settings, to change it we need to update the registry 
+            try {
+                $Global:ogExecutionPolicy = Get-ItemPropertyValue -Path 'HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell' -Name 'ExecutionPolicy' -ErrorAction Stop
+                Reg.exe add 'HKLM\SOFTWARE\Policies\Microsoft\Windows\PowerShell' /v 'EnableScripts' /t REG_DWORD /d '1' /f >$null
+                Reg.exe add 'HKLM\SOFTWARE\Policies\Microsoft\Windows\PowerShell' /v 'ExecutionPolicy' /t REG_SZ /d 'Unrestricted' /f >$null
+                $Global:executionPolicyUser = $false
+            }
+            catch {
+                $Global:executionPolicyUser = $true
+                $Global:ogExecutionPolicy = Get-ItemPropertyValue -Path 'HKCU:\Software\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell' -Name 'ExecutionPolicy'
+                Reg.exe add 'HKCU\Software\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell' /v 'ExecutionPolicy' /t REG_SZ /d 'Unrestricted' /f >$null
+            }
+            
+           
         }
 
 
@@ -2228,7 +2238,12 @@ else {
 
                     #set executionpolicy back to what it was
                     if ($ogExecutionPolicy) {
-                        Reg.exe add 'HKLM\SOFTWARE\Policies\Microsoft\Windows\PowerShell' /v 'ExecutionPolicy' /t REG_SZ /d $ogExecutionPolicy /f >$null
+                        if ($Global:executionPolicyUser) {
+                            Reg.exe add 'HKCU\Software\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell' /v 'ExecutionPolicy' /t REG_SZ /d $ogExecutionPolicy /f >$null
+                        }
+                        else {
+                            Reg.exe add 'HKLM\SOFTWARE\Policies\Microsoft\Windows\PowerShell' /v 'ExecutionPolicy' /t REG_SZ /d $ogExecutionPolicy /f >$null
+                        } 
                     }
                     Restart-Computer -Force
                 }
@@ -2272,7 +2287,12 @@ catch {}
 
 #set executionpolicy back to what it was
 if ($ogExecutionPolicy) {
-    Reg.exe add 'HKLM\SOFTWARE\Policies\Microsoft\Windows\PowerShell' /v 'ExecutionPolicy' /t REG_SZ /d $ogExecutionPolicy /f >$null
+    if ($Global:executionPolicyUser) {
+        Reg.exe add 'HKCU\Software\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell' /v 'ExecutionPolicy' /t REG_SZ /d $ogExecutionPolicy /f >$null
+    }
+    else {
+        Reg.exe add 'HKLM\SOFTWARE\Policies\Microsoft\Windows\PowerShell' /v 'ExecutionPolicy' /t REG_SZ /d $ogExecutionPolicy /f >$null
+    } 
 }
 
 if (!$nonInteractive) {