diff --git a/usr/local/lib/network.bash b/usr/local/lib/network.bash
index 45c973c..04501eb 100644
--- a/usr/local/lib/network.bash
+++ b/usr/local/lib/network.bash
@@ -304,6 +304,7 @@ network_src_tab_load()
             tab_assign NETWORK_SRC_TAB    "${nstl_id},Port_Start"     "${nstl_port_start}"
             tab_assign NETWORK_SRC_TAB    "${nstl_id},Port_Range"     "${nstl_port_range}"
 
+            tab_assign NETWORK_SRC_TAB    "${nstl_id},Device"         "${nstl_device}"
             tab_assign NETWORK_SRC_TAB    "${nstl_id},Status"         "${nstl_status}"
             tab_assign NETWORK_SRC_TAB    "${nstl_id},Bytes_Received" "${nstl_bytes_received}"
             tab_assign NETWORK_SRC_TAB    "${nstl_id},Bytes_Sent"     "${nstl_bytes_sent}"
@@ -346,6 +347,7 @@ network_src_tab_get()
 	src_port_end=""
     fi
     
+             src_device=${NETWORK_SRC_TAB["${src_id},Device"]}
              src_status=${NETWORK_SRC_TAB["${src_id},Status"]}
      src_bytes_received=${NETWORK_SRC_TAB["${src_id},Bytes_Received"]}
          src_bytes_sent=${NETWORK_SRC_TAB["${src_id},Bytes_Sent"]}
diff --git a/var/www/cgi-bin/vpn-admin_board.cgi b/var/www/cgi-bin/vpn-admin_board.cgi
index 38bf63b..6f5d90f 100755
--- a/var/www/cgi-bin/vpn-admin_board.cgi
+++ b/var/www/cgi-bin/vpn-admin_board.cgi
@@ -192,7 +192,9 @@ Source_Routing_Board_Line()
 
             echo -n "<TD>${NETWORK_SRC_TYPE[${src_type}]}</TD><TD>${src_ip}</TD><TD>${host_name}</TD>"
 
-            case "${src_status}"
+            echo -n "<TD>${src_device}</TD>"
+            
+            case "${src_status:--}"
             in
                 "0")
                     echo -n "<TD><IMG SRC=\"/icons/user-busy.png\" TITLE=\"Down\" ALT=\"Down\"></TD>"
@@ -206,10 +208,8 @@ Source_Routing_Board_Line()
                     echo -n "<TD>-</TD>"
                 ;;
             esac
-
-            echo -n "<TD>${src_device}</TD>"
         else
-            echo -n "${src_id};${NETWORK_SRC_TYPE[${src_type}]};${src_ip};${host_name};${status};${src_device};"
+            echo -n "${src_id};${NETWORK_SRC_TYPE[${src_type}]};${src_ip};${host_name};${src_device};${status};"
         fi
 
 
@@ -281,7 +281,7 @@ Source_Routing_Board()
         echo "    <H2>Source Routing Board</H2>"
         echo ""
         echo "    <TABLE BORDER=\"1\" WIDTH=\"100%\">"
-        echo -n "      <TR class="header"><TD class="header">#</TD><TD>Type</TD><TD>IP</TD><TD>Host Name</TD><TD>Status</TD><TD>Device</TD>"
+        echo -n "      <TR class="header"><TD class="header">#</TD><TD>Type</TD><TD>IP</TD><TD>Host Name</TD><TD>Device</TD><TD>Status</TD>"
     else
         echo "TABLE: Source_Routing_Board"
         echo -n "#;Type;IP;Host Name;Status;Device;"