diff --git a/scripts/Common/Scripts/Software.ps1 b/scripts/Common/Scripts/Software.ps1
index 9af538e5..b0cbfa35 100644
--- a/scripts/Common/Scripts/Software.ps1
+++ b/scripts/Common/Scripts/Software.ps1
@@ -180,12 +180,12 @@ $null = New-Module {
                 if ($action -eq ([InstallerAction]::Install)) {
                     Write-Host "Installing $Name…";
                     & $Installer @argumentList;
+                    # ToDo: Automatically configure after installation
                 } elseif ($Action -eq ([InstallerAction]::Configure)) {
                     Write-Host "Configuring $Name…";
                     & $Configurator @argumentList;
 
-                    foreach ($user in Get-Users) {
-                        $Arguments.Add($userArgument, $user);
+                    if (-not (Test-SetupUser)) {
                         $argumentList.Add("action", [InstallerAction]::ConfigureUser);
                         & $installHandler @argumentList;
                     }