diff --git a/package/ubnt-web/src/lib/link.inc b/package/ubnt-web/src/lib/link.inc
index 2b367b3..d48d787 100644
--- a/package/ubnt-web/src/lib/link.inc
+++ b/package/ubnt-web/src/lib/link.inc
@@ -976,10 +976,16 @@ Function cfg_get_ipv4mask $cfg, $iface, $mask (
 );
 
 Function cfg_get_ipv4gw $cfg, $iface, $gw (
-	if (!strlen($gw)) {
-		$gw = "0.0.0.0";
-	}
-	return cfg_get_def($cfg, "route.1.gateway", $gw);
+        $status = "disabled";
+        $status = cfg_get_def($cfg, "route.1.status", $status);
+        if($status == "enabled")
+        {
+                if (!strlen($gw)) {
+                        $gw = "0.0.0.0";
+                }
+                return cfg_get_def($cfg, "route.1.gateway", $gw);
+        }
+        return "";
 );
 
 Function cfg_get_dns $cfg, $dns, $no (
diff --git a/package/ubnt-web/src/lib/netrouterap.tmpl b/package/ubnt-web/src/lib/netrouterap.tmpl
index 48ae77f..c8ec2e0 100644
--- a/package/ubnt-web/src/lib/netrouterap.tmpl
+++ b/package/ubnt-web/src/lib/netrouterap.tmpl
@@ -152,7 +152,7 @@ jQuery(document).ready(initRouter);
 	<td colspan="3"><input type="text" class="i_static" style="width: 145px;" name="lanmask" id="lanmask" value="<?echo $lanmask>" req="1" callback="validateWanNetmask" realname="<? echo dict_translate("LAN Netmask"); >"/></td>
 	</tr>
 	<tr class="static"><td class="f"><? echo dict_translate("Gateway IP:"); ></td>
-	<td colspan="3"><input type="text" class="i_static" style="width: 145px;" name="wangw" id="wangw" value="<?echo $wangw>" req="1" callback="validateWanIP" realname="<? echo dict_translate("LAN Gateway IP"); >"/></td>
+	<td colspan="3"><input type="text" class="i_static" style="width: 145px;" name="wangw" id="wangw" value="<?echo $wangw>" req="1" callback="validateWlanOptIP" realname="<? echo dict_translate("LAN Gateway IP"); >"/></td>
 	</tr>
 	<tr class="static"><td class="f"><? echo dict_translate("Primary DNS IP:"); ></td>
 	<td colspan="3"><input type="text" class="i_static" style="width: 145px;" name="dns1" id="dns1" value="<?echo $dns1>" req="1" callback="validateWanIP" realname="<? echo dict_translate("Primary DNS IP"); >"/></td>
diff --git a/package/ubnt-web/src/lib/netroutersta.tmpl b/package/ubnt-web/src/lib/netroutersta.tmpl
index 3ee5807..5e72ff8 100644
--- a/package/ubnt-web/src/lib/netroutersta.tmpl
+++ b/package/ubnt-web/src/lib/netroutersta.tmpl
@@ -111,7 +111,7 @@ jQuery(document).ready(initRouter);
 	realname="<? if ($netmode == "soho") { echo dict_translate("WAN Netmask"); } else { echo dict_translate("WLAN Netmask"); }>"/></td>
 	</tr>
        <tr class="static"><td class="f"><? echo dict_translate("Gateway IP:"); ></td>
-	<td colspan="3"><input type="text" style="width: 145px;" class="i_static" name="wangw" id="wangw" value="<?echo $wangw>" req="1" callback="validateWanIP"
+	<td colspan="3"><input type="text" style="width: 145px;" class="i_static" name="wangw" id="wangw" value="<?echo $wangw>" req="1" callback="validateWlanOptIP"
         realname="<? if ($netmode == "soho") { echo dict_translate("WAN Gateway IP"); } else { echo dict_translate("WLAN Gateway IP"); }>"/></td>
       </tr>
        <tr class="static"><td class="f"><? echo dict_translate("Primary DNS IP:"); ></td>