diff --git a/html/forms/discovery-module-update.inc.php b/html/forms/discovery-module-update.inc.php
index 224657ae5..df5a60dab 100644
--- a/html/forms/discovery-module-update.inc.php
+++ b/html/forms/discovery-module-update.inc.php
@@ -5,7 +5,7 @@
 $device['device_id'] = $_POST['device_id'];
 $module = 'discover_'.$_POST['discovery_module'];
 
-if(!isset($module) && !isset($device_id) && !is_numeric($device_id))
+if(!isset($module) && validate_device_id($device['device_id']) === false)
 {
   echo('error with data');
   exit;
diff --git a/html/forms/poller-module-update.inc.php b/html/forms/poller-module-update.inc.php
index c9d07cf83..8b686e610 100644
--- a/html/forms/poller-module-update.inc.php
+++ b/html/forms/poller-module-update.inc.php
@@ -5,7 +5,7 @@
 $device['device_id'] = $_POST['device_id'];
 $module = 'poll_'.$_POST['poller_module'];
 
-if(!isset($module) && !isset($device_id) && !is_numeric($device_id))
+if(!isset($module) && validate_device_id($device['device_id']) === false)
 {
   echo('error with data');
   exit;