diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
index b0ed50d6d..e84cbfcf8 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
@@ -181,13 +181,16 @@
 				temp += '<a href="<%=url('admin/system/openmptcprouter/wizard')%>" id="omr-vps">';
 				var statusIcon = "<%=resource%>/openmptcprouter/images/statusOK.png";
 				var equipmentIcon = '<img src="<%=resource%>/server.png" />';
-				if (mArray.openmptcprouter.wan_addr == mArray.openmptcprouter.service_addr || (mArray.openmptcprouter.wan_addr !== "" && mArray.openmptcprouter.service_addr == "127.0.0.1"))
+				if (mArray.openmptcprouter.wan_addr == mArray.openmptcprouter.service_addr)
 				{
 					var title = String.format("OpenMPTCProuter Server (%s)", mArray.openmptcprouter.wan_addr);
-				} else if (mArray.openmptcprouter.wan_addr !== "")
+				} else if (mArray.openmptcprouter.wan_addr != "" && mArray.openmptcprouter.service_addr == "127.0.0.1")
+				{
+					var title = String.format("OpenMPTCProuter Server (%s)", mArray.openmptcprouter.wan_addr);
+				} else if (mArray.openmptcprouter.wan_addr != "")
 				{
 					var title = String.format("Direct output (%s)", mArray.openmptcprouter.wan_addr);
-				} else if (mArray.openmptcprouter.wan_addr == "" && mArray.openmptcprouter.ss_addr != "" && mArray.openmptcprouter.vps_status !== "DOWN")
+				} else if (mArray.openmptcprouter.ss_addr != "" && mArray.openmptcprouter.vps_status != "DOWN")
 				{
 					var title = String.format("OpenMPTCProuter Server (%s)", mArray.openmptcprouter.ss_addr);
 				} else {
@@ -218,6 +221,10 @@
 					{
 						statusMessage += 'No WAN IP address detected in less than 1 second<br/>';
 					}
+					if (mArray.openmptcprouter.vps_admin == false)
+					{
+						statusMessage += 'Can\'t contact Server Admin Script<br/>';
+					} 
 					if (mArray.openmptcprouter.vps_mptcp == "0")
 					{
 						statusMessage += 'MPTCP is not enabled on the server<br/>';