diff --git a/src/www/diag_ping.php b/src/www/diag_ping.php
index 7c7f60e51..605d41d00 100644
--- a/src/www/diag_ping.php
+++ b/src/www/diag_ping.php
@@ -38,7 +38,9 @@ $cmd_action = false;
 if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     // set form defaults
     $pconfig = array();
-    $pconfig['count'] = 3;
+    $pconfig['count'] = isset($_GET['count']) ? $_GET['count'] : 3;
+    $pconfig['host'] = isset($_GET['host']) ? $_GET['host'] : null;
+    $pconfig['interface'] = isset($_GET['interface']) ? $_GET['interface'] : null;
 } elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
     // validate formdata and schedule action
     $pconfig = $_POST;