diff --git a/powerwall.sh b/powerwall.sh
index c4e4452c..6094bc11 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -554,6 +554,7 @@ HOSTMGMT(){
 		case "$1" in
 			-p|-power) POWER=${2}; MODE="power";;
 			-e|-esxi) ESXI=${2}; MODE="esxi";;
+			-y) FORCE=true;;
 		esac
 		shift 1
 	done
@@ -582,7 +583,7 @@ HOSTMGMT(){
 	
 	([ "${HOST}" == "" ] || ([ "${POWER}" == "" ] && [ "${ESXI}" == "" ])) && echo -e "Invalid command arguments\n" && exit 1
 	
-	if [ "${TEST}" != "true" ] && ([ "${POWER^^}" == "OFF" ] || [ "${ESXI^^}" == "OFF" ] || [ ${MM} -eq 1 ]); then
+	if [ "${TEST}" != "true" ] && [ "${FORCE}" != "true" ] && ([ "${POWER^^}" == "OFF" ] || [ "${ESXI^^}" == "OFF" ] || [ ${MM} -eq 1 ]); then
 		if [ ${MM} -eq 1 ]; then
 			read -n 1 -p "Are you sure you wish to put '${ESXI_HOST}' into maintenance mode ? (y/N): " choice
 		else