diff --git a/powerwall.sh b/powerwall.sh
index 2405120c..cf5d174d 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -384,8 +384,14 @@ SHUTDOWN_SERVER(){
 			else
 				echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}"
 			fi
-					
-			MSG="Shutting down iSCSI-Server(s)"
+			
+			if [ "${ESXI_HOST}" == "10.10.2.10" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "CONSERVE" ]; then
+				MSG="Shutting down iSCSI-PRI Server"
+			elif [ "${ESXI_HOST}" == "10.10.2.17" ] || [ "${ESXI_HOST}" == "SYS" ]; then
+				MSG="Shutting down iSCSI-SYS Server"
+			elif [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "ALL" ]; then
+				MSG="Shutting down both iSCSI-PRI & iSCSI-SYS Servers"
+			fi
 			c=0; MSG_SPC=''; spc1=`expr ${HC_CW} - ${#MSG}`; until [ ${c} = ${spc1} ]; do MSG_SPC="${MSG_SPC} "; ((c++)); done
 			echo -en "${idsCL[White]}${MSG}${MSG_SPC}: "
 			if [ "${TEST}" != "true" ]; then