diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index f4d08a2521..22a1c9bf00 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -183,7 +183,7 @@ echo('<li><a href="ports/?status=0"><img src="images/16/link_error.png" border="
         <li><a href="health/temperatures/"><img src="images/icons/temperature.png" border="0" align="absmiddle" /> Temperatures</a></li>
         <li><a href="health/fanspeeds/"><img src="images/icons/fans.png" border="0" align="absmiddle" /> Fans</a></li>
         <li><a href="health/voltages/"><img src="images/icons/voltages.png" border="0" align="absmiddle" /> Voltages</a></li>
-        <li><a href="health/frequencies/"><img src="images/icons/voltages.png" border="0" align="absmiddle" /> Frequencies</a></li>
+        <li><a href="health/frequencies/"><img src="images/icons/frequencies.png" border="0" align="absmiddle" /> Frequencies</a></li>
         </ul>
         </td></tr></table>
 <!--[if lte IE 6]></a><![endif]-->
diff --git a/html/pages/device/overview.inc.php b/html/pages/device/overview.inc.php
index e3e592e9d4..10b4775214 100644
--- a/html/pages/device/overview.inc.php
+++ b/html/pages/device/overview.inc.php
@@ -80,6 +80,7 @@ include("overview/storage.inc.php");
 include("overview/temperatures.inc.php");
 include("overview/fanspeeds.inc.php");
 include("overview/voltages.inc.php");
+include("overview/frequencies.inc.php");
 
 echo("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>");
 echo("<p style='padding: 0px 5px 5px;' class=sectionhead><img align='absmiddle' src='".$config['base_url']."/images/16/report.png'> Recent Events</p>");
diff --git a/includes/discovery/voltages.inc.php b/includes/discovery/voltages.inc.php
index 56fc882f82..7cc03d080f 100755
--- a/includes/discovery/voltages.inc.php
+++ b/includes/discovery/voltages.inc.php
@@ -85,9 +85,15 @@ if ($device['os'] == "mgeups")
   list($unused,$numPhase) = explode(' ',$oids);
   for($i = 1; $i <= $numPhase;$i++)
   {
-    $volt_oid   = ".1.3.6.1.4.1.705.1.7.2.1.2.$i.0";
+    $volt_oid   = ".1.3.6.1.4.1.705.1.7.2.1.2.$i";
     $descr      = "Output"; if ($numPhase > 1) $descr .= " Phase $i";
-    $current    = snmp_get($device, $volt_oid, "-Oqv") / 10;
+    $current    = snmp_get($device, $volt_oid, "-Oqv");
+    if (!$current) 
+    {
+      $volt_oid .= ".0";
+      $current    = snmp_get($device, $volt_oid, "-Oqv");
+    }
+    $current   /= 10;
     $type       = "mge-ups";
     $precision  = 10;
     $index      = $i;
@@ -110,9 +116,15 @@ if ($device['os'] == "mgeups")
   list($unused,$numPhase) = explode(' ',$oids);
   for($i = 1; $i <= $numPhase;$i++)
   {
-    $volt_oid   = ".1.3.6.1.4.1.705.1.6.2.1.2.$i.0";
+    $volt_oid   = ".1.3.6.1.4.1.705.1.6.2.1.2.$i";
     $descr      = "Input"; if ($numPhase > 1) $descr .= " Phase $i";
-    $current    = snmp_get($device, $volt_oid, "-Oqv") / 10;
+    $current    = snmp_get($device, $volt_oid, "-Oqv");
+    if (!$current) 
+    {
+      $volt_oid .= ".0";
+      $current    = snmp_get($device, $volt_oid, "-Oqv");
+    }
+    $current   /= 10;
     $type       = "mge-ups";
     $precision  = 10;
     $index      = 100+$i;