diff --git a/delhost.php b/delhost.php
index e7fe8df5a0..c7de093283 100755
--- a/delhost.php
+++ b/delhost.php
@@ -11,7 +11,7 @@ if($argv[1]) {
   $host = strtolower($argv[1]);
   $id = getidbyname($host);
   if($id) {
-    delete_device($id);
+    echo delete_device($id);
     echo("Removed $host\n");
   } else {
     echo("Host doesn't exist!\n");
diff --git a/html/pages/delhost.php b/html/pages/delhost.php
index 3bd8d7a063..66bc44170d 100644
--- a/html/pages/delhost.php
+++ b/html/pages/delhost.php
@@ -6,9 +6,9 @@ if($_SESSION['userlevel'] < 10) {
 }
 
 if($_POST['id']) {
-  delete_device(mres($_POST['id']));
-} elseif (mres($_GET['id'])) {
-  delete_device(mres($_GET['id']));
+  echo delete_device(mres($_POST['id']));
+} elseif ($_GET['id']) {
+  echo delete_device(mres($_GET['id']));
 }
 
 ?>
diff --git a/includes/functions.php b/includes/functions.php
index a24b4abaf8..ead2ed4fc1 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -311,7 +311,7 @@ function delete_device($id)
     $int_if = $int_data['ifDescr'];
     $int_id = $int_data['interface_id'];
     delete_port($int_id);
-    echo("Removed interface $int_id ($int_if)<br />");
+    $ret = "Removed interface $int_id ($int_if)\n";
   }
   mysql_query("DELETE FROM `entPhysical` WHERE `device_id` = '$id'");
   mysql_query("DELETE FROM `devices_attribs` WHERE `device_id` = '$id'");
@@ -333,7 +333,7 @@ function delete_device($id)
   mysql_query("DELETE FROM `frequency` WHERE `device_id` = '$id'");
   mysql_query("DELETE FROM `current` WHERE `device_id` = '$id'");
   shell_exec("rm -rf ".$config['rrd_dir']."/$host");
-  echo("Removed device $host<br />");
+  return $ret . "Removed device $host\n";
 }
 
 function retireHost($id)