diff --git a/setupOffice.ps1 b/setupOffice.ps1
index 827c802..54a2158 100644
--- a/setupOffice.ps1
+++ b/setupOffice.ps1
@@ -27,13 +27,11 @@ function CheckOfficeInstall {
 }
 
 function CheckActivation {
-    $osLicense = Get-CimInstance -ClassName SoftwareLicensingProduct | Where-Object { $_.Description -match "Windows" }
-    $officeLicense = Get-CimInstance -ClassName SoftwareLicensingProduct | Where-Object { $_.Description -match "Office" }
-    $windows = $osLicense.Description
-    $office = $officeLicense.Description
+    $osLicense = Get-CimInstance SoftwareLicensingProduct -Filter "Name like 'Windows%'" | where { $_.PartialProductKey } | select Description, LicenseStatus
+    $officeLicense = Get-CimInstance SoftwareLicensingProduct -Filter "Name like 'Office%'" | where { $_.PartialProductKey } | select Description, LicenseStatus
 
     # if both activated return true
-    if ($osLicense.LicenseStatus -eq 1 -and $officeLicense.LicenseStatus -eq 1) {
+    if ($osLicense.LicenseStatus -eq 1 -and $officeLicense.LicenseStatus -eq 2) {
         Write-Host "Windows and Office are activated."
         return $true
     } else {
diff --git a/setupReg.ps1 b/setupReg.ps1
index c82e4f5..1c7ff67 100644
--- a/setupReg.ps1
+++ b/setupReg.ps1
@@ -87,27 +87,8 @@ function SetupEleveReg {
         }
         Write-Host "Added registry entries"
         Write-Host "Unloading registry HIVE"
-        $retryCount = 0
-        $retryLimit = 5
-        $success = $false
-
-        while (-not $success -and $retryCount -lt $retryLimit) {
-            Start-Sleep -s 5
-            Write-Host "REG UNLOAD HKEY_USERS\$UserSID (attempt $($retryCount + 1))"
-            $res = REG UNLOAD HKEY_USERS\$UserSID
-            if ($res -ne 0) {
-                Write-Host "Failed to unload $username's HKU registry hive. Retrying in 5 seconds..."
-                $retryCount++
-            }
-            else {
-                Write-Host "Unloaded $username's HKU registry hive."
-                $success = $true
-            }
-        }
-
-        if (-not $success) {
-            Write-Host "Failed to unload $username's HKU registry hive after $retryLimit attempts."
-        }
+        Write-Host "REG UNLOAD HKEY_USERS\$UserSID"
+        Start-Process powershell.exe -ArgumentList "REG UNLOAD HKEY_USERS\$UserSID" -WindowStyle Hidden
     } else {
         Write-Host "Unable to get the user's HKU registry."
     }