diff --git a/html/pages/device/edit.inc.php b/html/pages/device/edit.inc.php
index e12084441c..d31708d7e0 100644
--- a/html/pages/device/edit.inc.php
+++ b/html/pages/device/edit.inc.php
@@ -1,5 +1,9 @@
 <?php
 
+$link_array = array('page'    => 'device',
+                    'device'  => $device['device_id'],
+                    'tab' => 'edit');
+
 if ($_SESSION['userlevel'] < '7')
 {
   print_error("Insufficient Privileges");
@@ -25,9 +29,9 @@ if ($_SESSION['userlevel'] < '7')
   unset($sep);
   foreach ($panes as $type => $text)
   {
-    if (!isset($_GET['optc'])) { $_GET['optc'] = $type; }
+    if (!isset($vars['section'])) { $vars['section'] = $type; }
     echo($sep);
-    if ($_GET['optc'] == $type)
+    if ($vars['section'] == $type)
     {
       echo("<span class='pagemenu-selected'>");
       #echo('<img src="images/icons/'.$type.'.png" class="optionicon" />');
@@ -35,16 +39,18 @@ if ($_SESSION['userlevel'] < '7')
       #echo('<img src="images/icons/greyscale/'.$type.'.png" class="optionicon" />');
     }
 
-    echo("<a href='device/".$device['device_id']."/edit/" . $type . ($_GET['optd'] ? "/" . $_GET['optd'] : ''). "/'> " . $text ."</a>");
-    if ($_GET['optc'] == $type) { echo("</span>"); }
+    echo(generate_link($text,$link_array,array('section'=>$type)));
+
+#    echo("<a href='device/".$device['device_id']."/edit/" . $type . ($_GET['optd'] ? "/" . $_GET['optd'] : ''). "/'> " . $text ."</a>");
+    if ($vars['section'] == $type) { echo("</span>"); }
     $sep = " | ";
   }
 
   print_optionbar_end();
 
-  if (is_file("pages/device/edit/".mres($_GET['optc']).".inc.php"))
+  if (is_file("pages/device/edit/".mres($vars['section']).".inc.php"))
   {
-    include("pages/device/edit/".mres($_GET['optc']).".inc.php");
+    include("pages/device/edit/".mres($vars['section']).".inc.php");
   }
 }