diff --git a/setup/so-setup b/setup/so-setup
index a082d6985..58a9ce0d9 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -56,7 +56,7 @@ fi
 
 whiptail_install_type
 
-short_name=$(echo "$hostname" | awk -F. '{print $1}')
+short_name=$(echo "$HOSTNAME" | awk -F. '{print $1}')
 
 MINION_ID=$(echo "${short_name}_${install_type}" | tr '[:upper:]' '[:lower:]')
 export MINION_ID
@@ -79,6 +79,7 @@ elif [ "$install_type" = 'MASTER' ]; then
 	is_distmaster=true
 elif [ "$install_type" = 'SENSOR' ]; then
 	is_sensor=true
+	is_minion=true
 	STRELKA=1
 elif [[ "$install_type" =~ ^('SEARCHNODE'|'PARSINGNODE'|'HOTNODE'|'WARMNODE')$ ]]; then
 	is_node=true