diff --git a/scripts/Common/Scripts/Software.ps1 b/scripts/Common/Scripts/Software.ps1
index 420b0bd9..d676c060 100644
--- a/scripts/Common/Scripts/Software.ps1
+++ b/scripts/Common/Scripts/Software.ps1
@@ -244,7 +244,7 @@ $null = New-Module {
 
                     & $installHandler @argumentList -Action ([InstallerAction]::Configure);
 
-                    if (-not (Test-SetupUser)) {
+                    if ($UserConfigurator -and (-not (Test-SetupUser))) {
                         & $installHandler @argumentList -Action ([InstallerAction]::ConfigureUser);
                     }
                     # ToDo: Automatically configure after installation