diff --git a/includes/html/graphs/generic_multi_seperated.inc.php b/includes/html/graphs/generic_multi_seperated.inc.php
index 3d12033ac5..bbb9a36e68 100644
--- a/includes/html/graphs/generic_multi_seperated.inc.php
+++ b/includes/html/graphs/generic_multi_seperated.inc.php
@@ -37,7 +37,11 @@ if ($format == 'octets' || $format == 'bytes') {
     $units = 'Bps';
     $format = 'bits';
 } else {
-    $units = 'bps';
+    if (isset($total_units) && $total_units == 'pps') {
+        $units = 'pps';
+    } else {
+        $units = 'bps';
+    }
     $format = 'bits';
 }
 
diff --git a/includes/html/graphs/port/nupkts.inc.php b/includes/html/graphs/port/nupkts.inc.php
index 2c9e1cad78..ee03d78c75 100644
--- a/includes/html/graphs/port/nupkts.inc.php
+++ b/includes/html/graphs/port/nupkts.inc.php
@@ -19,7 +19,7 @@ $rrd_list[4]['colour_area_in'] = 'FACF5A';
 $rrd_list[4]['colour_area_out'] = 'FF5959';
 
 $units = '';
-$units_descr = 'Packets';
+$units_descr = 'Packets/sec';
 $total_units = 'pps';
 $colours_in = 'purples';
 $multiplier = '1';