diff --git a/powerwall.sh b/powerwall.sh
index 44efba22..35c0e830 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -332,7 +332,7 @@ SHUTDOWN_SERVER(){
 			echo -en "${idsCL[White]}${MSG//${PW_ESXI_HOST_NAMES[${ESXIHOST}]}/${idsCL[LightCyan]}${PW_ESXI_HOST_NAMES[${ESXIHOST}]}}${idsCL[White]}${MSG_SPC}: "
 			for ESXIHOST in "${PW_MAINSITEHOSTS[@]}"; do
 				if [ "${TEST}" != "true" ]; then
-					VERIFY_ISCSI_VM_DOWN &
+					VERIFY_ISCSI_VM_DOWN "${ESXI_HOST}" "${ESXIHOST}" &
 				fi
 			done
 			if [ "${TEST}" != "true" ]; then
@@ -433,14 +433,14 @@ SHUTDOWN_SERVER(){
 }
 
 VERIFY_ISCSI_VM_DOWN(){
-	if [ "${ESXI_HOST}" == "10.10.2.10" ] || [ "${ESXI_HOST}" == "MAIN" ]; then
-		${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown-verify.ps1 ${ESXIHOST} >/dev/null 2>&1
-	elif [ "${ESXI_HOST}" == "10.10.2.17" ] || [ "${ESXI_HOST}" == "SYS" ]; then
-		${PW_FOLDER}/esxi-scripts/iscsi-sys-vm-shutdown-verify.ps1 ${ESXIHOST} >/dev/null 2>&1
-	elif [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "ALL" ]; then
-		${PW_FOLDER}/esxi-scripts/iscsi-all-shutdown-verify.ps1 ${ESXIHOST} >/dev/null 2>&1
+	if [ "${1}" == "10.10.2.10" ] || [ "${1}" == "MAIN" ]; then
+		${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown-verify.ps1 ${2} ###>/dev/null 2>&1
+	elif [ "${1}" == "10.10.2.17" ] || [ "${1}" == "SYS" ]; then
+		${PW_FOLDER}/esxi-scripts/iscsi-sys-vm-shutdown-verify.ps1 ${2} ###>/dev/null 2>&1
+	elif [ "${1}" == "MAINSITE" ] || [ "${1}" == "ALL" ]; then
+		${PW_FOLDER}/esxi-scripts/iscsi-all-shutdown-verify.ps1 ${2} ###>/dev/null 2>&1
 	fi
-	touch ${PW_TMPFOLDER}/verify.iscsi.${ESXI_HOST}.done
+	touch ${PW_TMPFOLDER}/verify.iscsi.${1}.done
 }
 
 HOSTMGMT(){