diff --git a/src/www/firewall_nat_edit.php b/src/www/firewall_nat_edit.php
index b790bddcb..b213bce9d 100644
--- a/src/www/firewall_nat_edit.php
+++ b/src/www/firewall_nat_edit.php
@@ -37,21 +37,32 @@ require_once("pfsense-utils.inc");
 function formInterfaces() {
     global $config;
     $interfaces = array();
-    foreach ( get_configured_interface_with_descr(false, true) as $if => $ifdesc)
+    foreach ( get_configured_interface_with_descr(false, true) as $if => $ifdesc) {
         $interfaces[$if] = $ifdesc;
+    }
 
-    if (isset($config['l2tp']['mode']) && $config['l2tp']['mode'] == "server")
+    if (!empty($config['ifgroups']['ifgroupentry']) && is_array($config['ifgroups']['ifgroupentry'])) {
+        foreach ($config['ifgroups']['ifgroupentry'] as $ifgrp) {
+            $interfaces[$ifgrp['ifname']] = $ifgrp['descr'];
+        }
+    }
+
+    if (isset($config['l2tp']['mode']) && $config['l2tp']['mode'] == "server") {
         $interfaces['l2tp'] = "L2TP VPN";
+    }
 
-    if (isset($config['pptpd']['mode']) && $config['pptpd']['mode'] == "server")
+    if (isset($config['pptpd']['mode']) && $config['pptpd']['mode'] == "server") {
         $interfaces['pptp'] = "PPTP VPN";
+    }
 
-    if (is_pppoe_server_enabled())
+    if (is_pppoe_server_enabled()) {
         $interfaces['pppoe'] = "PPPoE VPN";
+    }
 
     /* add ipsec interfaces */
-    if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable']))
+    if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable'])) {
         $interfaces["enc0"] = "IPsec";
+    }
 
     /* add openvpn/tun interfaces */
     if (isset($config['openvpn']['openvpn-server']) || isset($config['openvpn']['openvpn-client'])) {
diff --git a/src/www/firewall_rules_edit.php b/src/www/firewall_rules_edit.php
index 136f4f368..0f077e400 100644
--- a/src/www/firewall_rules_edit.php
+++ b/src/www/firewall_rules_edit.php
@@ -44,21 +44,32 @@ $ostypes = json_decode(configd_run('filter list osfp json'));
 function formInterfaces() {
     global $config;
     $interfaces = array();
-    foreach ( get_configured_interface_with_descr(false, true) as $if => $ifdesc)
+    foreach ( get_configured_interface_with_descr(false, true) as $if => $ifdesc) {
         $interfaces[$if] = $ifdesc;
+    }
 
-    if (isset($config['l2tp']['mode']) && $config['l2tp']['mode'] == "server")
+    if (!empty($config['ifgroups']['ifgroupentry']) && is_array($config['ifgroups']['ifgroupentry'])) {
+        foreach ($config['ifgroups']['ifgroupentry'] as $ifgrp) {
+            $interfaces[$ifgrp['ifname']] = $ifgrp['descr'];
+        }
+    }
+
+    if (isset($config['l2tp']['mode']) && $config['l2tp']['mode'] == "server") {
         $interfaces['l2tp'] = "L2TP VPN";
+    }
 
-    if (isset($config['pptpd']['mode']) && $config['pptpd']['mode'] == "server")
+    if (isset($config['pptpd']['mode']) && $config['pptpd']['mode'] == "server") {
         $interfaces['pptp'] = "PPTP VPN";
+    }
 
-    if (is_pppoe_server_enabled())
+    if (is_pppoe_server_enabled()) {
         $interfaces['pppoe'] = "PPPoE VPN";
+    }
 
     /* add ipsec interfaces */
-    if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable']))
+    if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable'])) {
         $interfaces["enc0"] = "IPsec";
+    }
 
     /* add openvpn/tun interfaces */
     if (isset($config['openvpn']['openvpn-server']) || isset($config['openvpn']['openvpn-client'])) {