diff --git a/package/chocolatey/unigetui/tools/chocolateyInstall.template.ps1 b/package/chocolatey/unigetui/tools/chocolateyInstall.template.ps1
index 3c4a64745..4627914e8 100644
--- a/package/chocolatey/unigetui/tools/chocolateyInstall.template.ps1
+++ b/package/chocolatey/unigetui/tools/chocolateyInstall.template.ps1
@@ -7,8 +7,8 @@ $PackageArgs = @{
   packageName   = $PackageName
   url           = $Url
   fileType      = 'exe'
-  silentArgs    = '/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP- /ALLUSERS /NoWinGet /NoAutoStart'
-  validExitCodes= @(0, 3010)
+  silentArgs    = '/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP- /NoEdgeWebView /NoVCRedist /NoChocolatey /EnableSystemChocolatey'
+  validExitCodes= @(0, 3010, 1641)
   checksum      = '$VAR2$'
   checksumType  = 'sha256'
 }
diff --git a/package/chocolatey/unigetui/tools/chocolateyUninstall.ps1 b/package/chocolatey/unigetui/tools/chocolateyUninstall.ps1
index 6ec4c527e..0ee3a77c3 100644
--- a/package/chocolatey/unigetui/tools/chocolateyUninstall.ps1
+++ b/package/chocolatey/unigetui/tools/chocolateyUninstall.ps1
@@ -1,32 +1,25 @@
 $ErrorActionPreference = 'Stop'
 
-$PackageName = 'unigetui'
-
 $PackageArgs = @{
-  packageName   = $PackageName
-  softwareName  = 'UniGetUI'
+  packageName   = $env:ChocolateyPackageName
+  softwareName  = 'unigetui*'
   fileType      = 'exe'
-  silentArgs    = '/VERYSILENT /SUPPRESSMSGBOXES /NORESTART'
-  validExitCodes= @(0, 3010)
+  silentArgs    = '/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-'
+  validExitCodes= @(0, 3010, 1605, 1614, 1641)
 }
 
 [array]$Key = Get-UninstallRegistryKey -SoftwareName $PackageArgs['softwareName']
 
 if ($Key.Count -eq 1) {
   $Key | % {
-    $uninstallExe = $_.UninstallString -replace '"', ''
-    if (Test-Path $uninstallExe) {
-      $PackageArgs['file'] = $uninstallExe
-      Uninstall-ChocolateyPackage @PackageArgs
-    } else {
-      Write-Warning "Uninstaller not found at $uninstallExe"
-    }
+    $PackageArgs['file'] = "$($_.UninstallString)"
+    Uninstall-ChocolateyPackage @PackageArgs
   }
 } elseif ($Key.Count -eq 0) {
-  Write-Warning "$PackageName has already been uninstalled."
+  Write-Warning "$($PackageArgs['packageName']) has already been uninstalled by other means."
 } elseif ($Key.Count -gt 1) {
   Write-Warning "$($Key.Count) matches found!"
   Write-Warning "To prevent accidental data loss, no programs will be uninstalled."
-  Write-Warning "The following keys were matched:"
-  $Key | % {Write-Warning "- $($_.DisplayName)"}
+  Write-Warning "Please alert package maintainer the following keys were matched:"
+  $Key | % { Write-Warning "- $($_.DisplayName)" }
 }