diff --git a/setup/so-functions b/setup/so-functions
index 3f3b068d4..b132ba64d 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -605,7 +605,7 @@ collect_oinkcode() {
 collect_patch_schedule() {
 	whiptail_patch_schedule
 
-	case $patch_schedule in
+	case "$patch_schedule" in
 		'New Schedule')
 			whiptail_patch_schedule_select_days
 			whiptail_patch_schedule_select_hours
diff --git a/setup/so-whiptail b/setup/so-whiptail
index edb784b31..e66cd3ccd 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -1074,6 +1074,8 @@ whiptail_patch_schedule() {
 
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus
+
+	export patch_schedule
 }
 
 whiptail_patch_schedule_import() {