diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
index d4cf3849d..18cc3ce64 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
@@ -69,17 +69,17 @@
 				var equipmentIcon = '<img src="<%=resource%>/computer.png" />';
 				if (mArray.openmptcprouter.remote_addr)
 				{
-					if (mArray.openmptcprouter.remote_from_lease)
+					if (mArray.openmptcprouter.remote_from_lease == false)
 					{
-						var title = String.format('<br /><strong>%s (%s)</strong>', mArray.openmptcprouter.remote_hostname ? mArray.openmptcprouter.remote_hostname : _('You'), mArray.openmptcprouter.remote_addr)
-						var statusMessageClass = "";
-						var statusIcon = "<%=resource%>/openmptcprouter/images/statusOK.png";
-						var statusMessage = "";
-					} else {
 						var title = String.format("%s (%s)",'You', mArray.openmptcprouter.remote_addr);
 						var statusMessageClass = "warning";
 						var statusIcon = "<%=resource%>/openmptcprouter/images/statusWarning.png";
 						var statusMessage = _('Your IP was not leased by this router');
+					} else {
+						var title = String.format('<br /><strong>%s (%s)</strong>', mArray.openmptcprouter.remote_hostname ? mArray.openmptcprouter.remote_hostname : _('You'), mArray.openmptcprouter.remote_addr)
+						var statusMessageClass = "";
+						var statusIcon = "<%=resource%>/openmptcprouter/images/statusOK.png";
+						var statusMessage = "";
 					}
 				} else {
 					var title = String.format('<br /><strong>%s</strong>', _('Clients'))
@@ -261,6 +261,10 @@
 				{
 					statusMessage += _('MPTCP is not enabled on the server') + '<br/>';
 				} 
+				if (mArray.openmptcprouter.vps_time_accurate == false)
+				{
+					statusMessage += _('Big time difference between the server and the router') + '<br/>';
+				} 
 				if (statusMessage !== "" && statusMessageClass !== "error")
 				{
 					statusMessageClass = "warning";
diff --git a/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter b/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter
index e70c0f412..20a2ed05e 100755
--- a/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter
+++ b/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter
@@ -1,7 +1,6 @@
 #!/usr/bin/env lua
 
 local math  = require "math"
-local tools = require "luci.tools.status"
 local sys   = require "luci.sys"
 local json  = require("luci.json")
 local fs    = require("nixio.fs")
@@ -642,6 +641,7 @@ function interfaces_status()
 	end)
 
 	mArray.openmptcprouter["server_mptcp"] = ""
+	mArray.openmptcprouter["omr_time"] = os.time()
 	-- dns
 	mArray.openmptcprouter["dns"] = false
 	local dns_test = sys.exec("dig openmptcprouter.com | grep 'ANSWER: 0'")
@@ -695,16 +695,6 @@ function interfaces_status()
 		end
 	end
 
-	--mArray.openmptcprouter["remote_addr"] = luci.http.getenv("REMOTE_ADDR") or ""
-	mArray.openmptcprouter["remote_from_lease"] = false
-	local leases=tools.dhcp_leases()
-	for _, value in pairs(leases) do
-		if value["ipaddr"] == mArray.openmptcprouter["remote_addr"] then
-			mArray.openmptcprouter["remote_from_lease"] = true
-			mArray.openmptcprouter["remote_hostname"] = value["hostname"]
-		end
-	end
-
 	if  mArray.openmptcprouter["service_addr"] ~= "" and mArray.openmptcprouter["service_addr"] ~= "127.0.0.1" then
 		mArray.openmptcprouter["vps_status"] = "DOWN"
 	else
@@ -741,6 +731,14 @@ function interfaces_status()
 						mArray.openmptcprouter["vps_uptime"] = vpsinfo.vps.uptime or ""
 						mArray.openmptcprouter["vps_mptcp"] = vpsinfo.vps.mptcp or ""
 						mArray.openmptcprouter["vps_hostname"] = vpsinfo.vps.hostname or ""
+						mArray.openmptcprouter["vps_time"] = vpsinfo.vps.time or ""
+						if vpsinfo.vps.time ~= "" then
+							if os.time() - vpsinfo.vps.time > 10 then
+								mArray.openmptcprouter["vps_time_accurate"] = false
+							else
+								mArray.openmptcprouter["vps_time_accurate"] = true
+							end
+						end
 						mArray.openmptcprouter["vps_admin"] = true
 						mArray.openmptcprouter["vps_status"] = "UP"
 						mArray.openmptcprouter["vps_admin_error_msg"] = ""