diff --git a/setup/so-whiptail b/setup/so-whiptail
index 693d0554b..e404152e5 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -1846,21 +1846,19 @@ whiptail_suricata_pins() {
 
 # shellcheck disable=2120
 whiptail_uppercase_warning() {
-	local type=${1:-hostname}
-
-	local HOSTNAME='TestHostname'
-	local REDIRECTIT='my.TestDomain.com'
+	local type=$1
 
 	local msg
-	if [[ $type == 'hostname' ]]; then
+	if [[ -z $type ]]; then
+		type="hostname"
 		read -r -d '' msg <<- EOM
-		The value "$HOSTNAME" contains non-lowercase characters. 
+		The value "$HOSTNAME" contains uppercase characters.
 		
 		Continuing with this hostname could render the system unusable in certain cases, and will also disable the option later in setup to access Security Onion's web interface via the hostname.
 		EOM
 	else
 		read -r -d '' msg <<- EOM
-		The value "$REDIRECTIT" contains non-lowercase characters. 
+		The value "$REDIRECTHOST" contains uppercase characters.
 		
 		Continuing with this value could render the system unusable in certain cases.
 		EOM
@@ -1872,7 +1870,7 @@ whiptail_uppercase_warning() {
 	For best results, it is recommended to only use lowercase ${type}s with Security Onion. For more information see https://docs.securityonion.com/uppercase (URL TBD)
 	EOM
 
-	whiptail --title "$whiptail_title" --yesno "$msg" --yes-button "Continue anyway" --no-button "Go back" 16 75
+	whiptail --title "$whiptail_title" --yesno "$msg" --yes-button "Continue anyway" --no-button "Go back" --defaultno 16 75
 }
 
 whiptail_you_sure() {