diff --git a/script/configure-integration-tests.ps1 b/script/configure-integration-tests.ps1
index 590291d95c..0bfcc1f186 100644
--- a/script/configure-integration-tests.ps1
+++ b/script/configure-integration-tests.ps1
@@ -1,4 +1,3 @@
-# TODO: this should indicate whether a variable is required or optional
 
 function SetVariable([string]$key, [string]$value)
 {
@@ -8,59 +7,70 @@ function SetVariable([string]$key, [string]$value)
 
 function AskYesNoQuestion([string]$question, [string]$key)
 {
-  $answer = Read-Host -Prompt ($question + " Press Y to set this, otherwise we'll skip it")
-  if ($answer -eq "Y")
-  {
-      SetVariable $key "YES"
-  }
-  else
-  {
-      SetVariable $key $null
-  }
-
-  Write-Host
-
-  return ($answer -eq "Y")
+	$answer = Read-Host -Prompt ($question + " Press Y to set this, otherwise we'll skip it")
+	if ($answer -eq "Y")
+	{
+		SetVariable $key "YES"
+	}
+	else
+	{
+		SetVariable $key $null
+	}
+	
+	Write-Host
+	
+	return ($answer -eq "Y")
 }
 
 function VerifyEnvironmentVariable([string]$friendlyName, [string]$key, [bool]$optional = $false)
 {
-    if ($optional -eq $true)
-    {
-       $label = "(optional)"
-    }
-    else
-    {
-       $label = "(required)"
-    }
-
-    $existing_value = [environment]::GetEnvironmentVariable($key,"User")
-    if ($existing_value -eq $null)
-    {
-       $value = Read-Host -Prompt "Set the $friendlyName to use for the integration tests $label"
-       SetVariable $key $value
-    }
-    else
-    {
-       Write-Host "$existing_value found as the configured $friendlyName"
-       $reset = Read-Host -Prompt "Want to change this? Press Y, otherwise we'll move on"
-       if ($reset -eq "Y")
-       {
-           $value = Read-Host -Prompt "Change the $friendlyName to use for the integration tests"
-           SetVariable $key $value
-       }
-
-       if ($optional -eq $true)
-       {
-            $clear = Read-Host -Prompt 'Want to remove this optional value, press Y'
-            if ($clear -eq "Y")
-            {
-                SetVariable $key $null
-            }
-       }
-    }
-
-    Write-Host
+	if ($optional -eq $true)
+	{
+		$label = "(optional)"
+	}
+	else
+	{
+		$label = "(required)"
+	}
+
+	$existing_value = [environment]::GetEnvironmentVariable($key,"User")
+	if ($existing_value -eq $null)
+	{
+		$value = Read-Host -Prompt "Set the $friendlyName to use for the integration tests $label"
+		SetVariable $key $value
+	}
+	else
+	{
+		Write-Host "$existing_value found as the configured $friendlyName"
+		if ($optional -eq $true)
+		{
+			$clear = Read-Host -Prompt 'Want to remove or change this optional value, press Y'
+			if ($clear -eq "Y")
+			{
+				$reset = Read-Host -Prompt "Press R to remove and Press C to change the value, otherwise we'll move on"
+				if ($reset -eq "C")
+				{
+					$value = Read-Host -Prompt "Change the $friendlyName to use for the integration tests"
+       				SetVariable $key $value
+				}
+				elseif ($reset -eq "R")
+				{
+					SetVariable $key $null
+				}
+			}
+		}
+		else
+		{
+			$reset = Read-Host -Prompt "Press Y to change this value, otherwise we'll move on "
+			if ($reset -eq "Y")
+			{
+				$value = Read-Host -Prompt "Change the $friendlyName to use for the integration tests"
+       			SetVariable $key $value
+			}
+		}
+	}
+
+	Write-Host
 }
 
 Write-Host