diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index ecd6dc07..226325fe 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -300,8 +300,11 @@ CHECKPOWER(){
 		
 		[ ${REPORT} -eq 0 ] && echo -en "${idsCL[Yellow]}Pulling data from 'Offsite' ... "
 	
-		# upsinfo=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 admin@10.2.1.1 'upsc CP1500PFCLCD')
-		upsinfo=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_OFFSITE_MONITOR} 'upsc CP1500PFCLCD' 2>&1)
+		if [ "${PW_OFFSITE_MONITOR}" = "$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1)" ]; then
+			upsinfo=$(upsc CP1500PFCLCD 2>&1)
+		else
+			upsinfo=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_OFFSITE_MONITOR} 'upsc CP1500PFCLCD' 2>&1)
+		fi
 		if [ "$(echo "${upsinfo}" | grep 'input.voltage:')" != "" ]; then
 			OFFSITE_STATUS=$(echo "${upsinfo}" | grep 'ups.status:' | sed 's/.*: //')
 			[ "${PW_OFFSITE_UPS_CODES[${OFFSITE_STATUS}]}" != "" ] && OFFSITE_STATUS=${PW_OFFSITE_UPS_CODES[${OFFSITE_STATUS}]} || OFFSITE_STATUS=${OFFSITE_STATUS}
@@ -961,8 +964,11 @@ POWERLOGGER_SERVICE(){
 			fi
 		fi
 				
-		# upsinfo=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 admin@10.2.1.1 'upsc CP1500PFCLCD')
-		upsinfo=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_OFFSITE_MONITOR} 'upsc CP1500PFCLCD' 2>&1)
+		if [ "${PW_OFFSITE_MONITOR}" = "$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1)" ]; then
+			upsinfo=$(upsc CP1500PFCLCD 2>&1)
+		else
+			upsinfo=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_OFFSITE_MONITOR} 'upsc CP1500PFCLCD' 2>&1)
+		fi
 		if [ "$(echo "${upsinfo}" | grep 'input.voltage:')" != "" ]; then
 			OFFSITE_VOLTOUT=$(echo "${upsinfo}" | grep 'output.voltage:' | sed 's/.*: //')
 			OFFSITE_LOAD=$(echo "${upsinfo}" | grep 'ups.load:' | sed 's/.*: //')