diff --git a/setup/so-functions b/setup/so-functions
index 0a76ffd76..9aeda0bc3 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -232,7 +232,7 @@ check_pass_match() {
 	local var=$3
 
 	if [ "$pass" = "$confirm_pass" ]; then
-		declare "$var=yes"
+		export "$var=yes"
 	else
 		whiptail_passwords_dont_match
 	fi
diff --git a/setup/so-whiptail b/setup/so-whiptail
index 0ff3d5641..1667722d9 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -279,7 +279,7 @@ whiptail_enable_components() {
 
 	# Set any variables to 1 if they exist in COMPONENTS
 	for component in "${COMPONENTS[@]}"; do
-    	declare "$component=1"
+    	export "$component=1"
 	done