From 21b0dec9552d09e49184b8f3d6bc591cd335ac8a Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Sat, 10 Aug 2024 15:19:14 +0200
Subject: [PATCH] Disable UAC after logging in MS account

---
 scripts/Windows/OS/Install.ps1 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/scripts/Windows/OS/Install.ps1 b/scripts/Windows/OS/Install.ps1
index 5c3d5f79..e01f610e 100644
--- a/scripts/Windows/OS/Install.ps1
+++ b/scripts/Windows/OS/Install.ps1
@@ -497,6 +497,7 @@ $null = New-Module {
 
                             if ($currentUser -lt $users.Count) {
                                 $user = Get-LocalUser $users[$currentUser];
+                                $msAccount = Get-UserConfig -UserName "$user" -Name "microsoftAccount";
 
                                 Add-LocalGroupMember `
                                     -SID ([SecurityIdentifier]::new([WellKnownSidType]::BuiltinAdministratorsSid, $null))`
@@ -507,7 +508,7 @@ $null = New-Module {
                                     Disable-LocalUser $env:UserName;
                                     Enable-LocalUser $user;
 
-                                    if (Get-UserConfig -UserName "$user" -Name "microsoftAccount") {
+                                    if ($msAccount) {
                                         Enable-UAC;
                                         Disable-Autologin;
                                         Enable-OneShotListener;
@@ -518,6 +519,14 @@ $null = New-Module {
 
                                     Restart-Intermediate -DefaultUser;
                                     return;
+                                } else {
+                                    if ($msAccount) {
+                                        if (-not (Test-Admin)) {
+                                            Invoke-OneShot DisableUAC;
+                                            Restart-Computer;
+                                            return;
+                                        }
+                                    }
                                 }
 
                                 if (-not (Get-UserConfig -UserName "$user" "microsoftAccount")) {