diff --git a/html/pages/device/hrdevice.inc.php b/html/pages/device/hrdevice.inc.php
index a965bf56e..d300922bf 100644
--- a/html/pages/device/hrdevice.inc.php
+++ b/html/pages/device/hrdevice.inc.php
@@ -25,7 +25,7 @@ while ($hrdevice = mysql_fetch_assoc($hrdevices))
     $graph_array['from']     = $day;
     $graph_array_zoom   = $graph_array; $graph_array_zoom['height'] = "150"; $graph_array_zoom['width'] = "400";
 
-    $mini_graph = overlib_link($_SERVER['REQUEST_URI'], generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom),  NULL);
+    $mini_graph = overlib_link($proc_url, generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom),  NULL);
 
     echo('<td>'.$mini_graph.'</td>');
   }
@@ -45,7 +45,8 @@ while ($hrdevice = mysql_fetch_assoc($hrdevices))
       $graph_array['from']   = $day;
       $graph_array_zoom      = $graph_array; $graph_array_zoom['height'] = "150"; $graph_array_zoom['width'] = "400";
 
-      $mini_graph = overlib_link($_SERVER['REQUEST_URI'], generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom),  NULL);
+      # FIXME click on graph should also link to port, but can't use generate_port_link here...
+      $mini_graph = overlib_link("#", generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom),  NULL);
 
       echo("<td>$mini_graph</td>");
     } else {
diff --git a/html/pages/device/port/junose-atm-vp.inc.php b/html/pages/device/port/junose-atm-vp.inc.php
index 556432b76..89ea8b453 100644
--- a/html/pages/device/port/junose-atm-vp.inc.php
+++ b/html/pages/device/port/junose-atm-vp.inc.php
@@ -29,7 +29,7 @@ while ($vp = mysql_fetch_assoc($vps))
   {
     $graph_array['from'] = $$period;
     $graph_array_zoom   = $graph_array; $graph_array_zoom['height'] = "150"; $graph_array_zoom['width'] = "400";
-    echo(overlib_link($_SERVER['REQUEST_URI'], generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom),  NULL));
+    echo(overlib_link("#", generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom),  NULL));
   }
 
   echo('</td></tr>');
diff --git a/html/pages/device/services.inc.php b/html/pages/device/services.inc.php
index d4d698b2b..daf8c3dd3 100644
--- a/html/pages/device/services.inc.php
+++ b/html/pages/device/services.inc.php
@@ -49,7 +49,7 @@ if (mysql_result(mysql_query("select count(service_id) from services WHERE devic
          {
            $graph_array['from'] = $$period;
            $graph_array_zoom   = $graph_array; $graph_array_zoom['height'] = "150"; $graph_array_zoom['width'] = "400";
-           echo(overlib_link($_SERVER['REQUEST_URI'], generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom),  NULL));
+           echo(overlib_link("#", generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom),  NULL));
          }
          echo("</td></tr>");
        }
diff --git a/html/pages/logon.inc.php b/html/pages/logon.inc.php
index 9e1853d99..cecfe62fc 100644
--- a/html/pages/logon.inc.php
+++ b/html/pages/logon.inc.php
@@ -4,7 +4,7 @@
         <tr>
           <td><img src="images/login-hamster.png" alt="Login required" /></td>
           <td>
-            <form action="<?php echo($_SERVER['REQUEST_URI']) ?>" method="post" name="logonform">
+            <form action="" method="post" name="logonform">
               <h3>Please log in:</h3>
               <div style="height: 0px;"></div>
               <table border="0" align="left">
diff --git a/html/pages/services.inc.php b/html/pages/services.inc.php
index 4dd9881d6..cfe7e4cda 100644
--- a/html/pages/services.inc.php
+++ b/html/pages/services.inc.php
@@ -62,7 +62,7 @@ if ($_SESSION['userlevel'] >= '5')
          {
            $graph_array['from'] = $$period;
            $graph_array_zoom   = $graph_array; $graph_array_zoom['height'] = "150"; $graph_array_zoom['width'] = "400";
-           echo(overlib_link($_SERVER['REQUEST_URI'], generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom),  NULL));
+           echo(overlib_link("", generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom),  NULL));
          }
          echo("</td></tr>");
        }