diff --git a/html/includes/graphs/device/wifi_clients.inc.php b/html/includes/graphs/device/wifi_clients.inc.php
index 2e9991af94..c575c75759 100644
--- a/html/includes/graphs/device/wifi_clients.inc.php
+++ b/html/includes/graphs/device/wifi_clients.inc.php
@@ -1,24 +1,21 @@
 <?php
 
-require 'includes/graphs/common.inc.php';
+$colours = 'mixed';
+$unit_text = 'Clients';
+$scale_min = '0';
 
-$rrd_options .= ' -l 0 -E ';
 
-$radio1 = rrd_name($device['hostname'], 'wificlients-radio1');
-$radio2 = rrd_name($device['hostname'], 'wificlients-radio2');
+$i = 1;
+$rrd_filename = rrd_name($device['hostname'], "wificlients-radio$i");
+while (rrdtool_check_rrd_exists($rrd_filename)) {
+    $rrd_list[$i] =
+        array(
+            'filename' => $rrd_filename,
+            'ds' => 'wificlients',
+            'descr' => "Radio$i Clients",
+        );
+    $i++;
+    $rrd_filename = rrd_name($device['hostname'], "wificlients-radio$i");
+};
 
-if (file_exists($radio1)) {
-    $rrd_options .= " COMMENT:'                           Cur   Min  Max\\n'";
-    $rrd_options .= ' DEF:wificlients1='.$radio1.':wificlients:AVERAGE ';
-    $rrd_options .= " LINE1:wificlients1#CC0000:'Clients on Radio1    ' ";
-    $rrd_options .= ' GPRINT:wificlients1:LAST:%3.0lf ';
-    $rrd_options .= ' GPRINT:wificlients1:MIN:%3.0lf ';
-    $rrd_options .= ' GPRINT:wificlients1:MAX:%3.0lf\l ';
-    if (file_exists($radio2)) {
-        $rrd_options .= ' DEF:wificlients2='.$radio2.':wificlients:AVERAGE ';
-        $rrd_options .= " LINE1:wificlients2#008C00:'Clients on Radio2    ' ";
-        $rrd_options .= ' GPRINT:wificlients2:LAST:%3.0lf ';
-        $rrd_options .= ' GPRINT:wificlients2:MIN:%3.0lf ';
-        $rrd_options .= ' GPRINT:wificlients2:MAX:%3.0lf\l ';
-    }
-}
+require 'includes/graphs/generic_multi_line.inc.php';