diff --git a/source/Styles/xb3/jst/includes/header.jst b/source/Styles/xb3/jst/includes/header.jst
index 15cb739..57fbcc3 100644
--- a/source/Styles/xb3/jst/includes/header.jst
+++ b/source/Styles/xb3/jst/includes/header.jst
@@ -58,6 +58,7 @@ csrfProtector.init();
 	$webuiEnabled = getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.WebUI.Enable");
 	//$webuiEnabled = "msoOnly";
 	$webuiIsEnabled = "true";
+	$wanStatus = getStr("Device.X_RDK_WanManager.InterfaceActiveStatus");
 
 	$RemoteMgt = getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.WebUIRemoteMgtOption.Enable");
 	$http_mode = getStr("Device.UserInterface.X_CISCO_COM_RemoteAccess.HttpEnable");
@@ -65,6 +66,9 @@ csrfProtector.init();
 	if($wan_enabled=="true"){
         	$Wan_IPv4 = getStr("Device.DeviceInfo.X_COMCAST-COM_WAN_IP");
         	$Wan_IPv6 = getStr("Device.DeviceInfo.X_COMCAST-COM_WAN_IPv6");
+	}else if(strstr($wanStatus,"EPON,1") || strstr($wanStatus,"XGSPON,1")){
+        	$Wan_IPv4 = getStr("Device.DeviceInfo.X_COMCAST-COM_WAN_IP");
+        	$Wan_IPv6 = getStr("Device.DeviceInfo.X_COMCAST-COM_WAN_IPv6");
 	}else{
         	$Wan_IPv4 = getStr("Device.X_CISCO_COM_CableModem.IPAddress");
         	$Wan_IPv6 = getStr("Device.X_CISCO_COM_CableModem.IPv6Address");
diff --git a/source/Styles/xb6/jst/index.jst b/source/Styles/xb6/jst/index.jst
index 6da2a16..75f8a5c 100644
--- a/source/Styles/xb6/jst/index.jst
+++ b/source/Styles/xb6/jst/index.jst
@@ -51,6 +51,7 @@ $DeviceControl_value = KeyExtGet("Device.X_CISCO_COM_DeviceControl.", $DeviceCon
 $url = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : "" ;
 $wan_enabled=getStr("Device.Ethernet.X_RDKCENTRAL-COM_WAN.Enabled");
 $webuiEnabled = getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.WebUI.Enable");
+$wanStatus = getStr("Device.X_RDK_WanManager.InterfaceActiveStatus");
 $webuiIsEnabled = "true";
 $ModelName = getStr("Device.DeviceInfo.ModelName");
 $idadv ="";
@@ -65,6 +66,9 @@ else{
 if($wan_enabled=="true"){
 	$Wan_IPv4 = getStr("Device.DeviceInfo.X_COMCAST-COM_WAN_IP");
 	$Wan_IPv6 = getStr("Device.DeviceInfo.X_COMCAST-COM_WAN_IPv6");
+}else if(strstr($wanStatus,"EPON,1") || strstr($wanStatus,"XGSPON,1")){                                                              
+        $Wan_IPv4 = getStr("Device.DeviceInfo.X_COMCAST-COM_WAN_IP");                       
+        $Wan_IPv6 = getStr("Device.DeviceInfo.X_COMCAST-COM_WAN_IPv6");
 }else{
 	$Wan_IPv4 = getStr("Device.X_CISCO_COM_CableModem.IPAddress");
 	$Wan_IPv6 = getStr("Device.X_CISCO_COM_CableModem.IPv6Address");