diff --git a/scripts/Common/Scripts/Software.ps1 b/scripts/Common/Scripts/Software.ps1
index 81346ee5..ac97d4ff 100644
--- a/scripts/Common/Scripts/Software.ps1
+++ b/scripts/Common/Scripts/Software.ps1
@@ -253,8 +253,8 @@ $null = New-Module {
                         & $installHandler @argumentList;
                     }
                 } elseif ($Action -eq ([InstallerAction]::ConfigureUser)) {
-                    if ((-not $Arguments.ContainsKey($userArgument)) -or ($null -eq $Arguments[$userArgument])) {
-                        $argumentList.Add($userArgument, ($env:UserName));
+                    if ((-not $Arguments.ContainsKey($userArgument)) -or (-not $Arguments[$userArgument])) {
+                        $Arguments.Add($userArgument, ($env:UserName));
                     }
 
                     if ($UserConfigurator) {