diff --git a/setup/so-setup b/setup/so-setup
index 96f062654..cb82be2a6 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -57,13 +57,6 @@ fi
 
 whiptail_install_type
 
-short_name=$(echo "$HOSTNAME" | awk -F. '{print $1}')
-
-MINION_ID=$(echo "${short_name}_${install_type}" | tr '[:upper:]' '[:lower:]')
-export MINION_ID
-
-echo "MINION_ID = $MINION_ID" >> $setup_log 2>&1
-
 whiptail_patch_schedule
 
 if [ "$install_type" = 'EVAL' ]; then
@@ -125,6 +118,13 @@ case "$setup_type" in
 		;;
 esac
 
+short_name=$(echo "$HOSTNAME" | awk -F. '{print $1}')
+
+MINION_ID=$(echo "${short_name}_${install_type}" | tr '[:upper:]' '[:lower:]')
+export MINION_ID
+
+echo "MINION_ID = $MINION_ID" >> $setup_log 2>&1
+
 minion_type=$(get_minion_type)
 
 # Set any constants needed