diff --git a/html/pages/delhost.inc.php b/html/pages/delhost.inc.php
index f7f9d750d..cb4cd5675 100644
--- a/html/pages/delhost.inc.php
+++ b/html/pages/delhost.inc.php
@@ -20,12 +20,13 @@ if (is_numeric($_REQUEST['id']))
   else
   {
     $device = device_by_id_cache($_REQUEST['id']);
-    print_message("Are you sure you want to delete device " . $device['hostname'] . "?");
+    print_error("Are you sure you want to delete device " . $device['hostname'] . "?");
 ?>
 <br />
 <form name="form1" method="post" action="">
     <input type="hidden" name="id" value="<?php echo $_REQUEST['id'] ?>" />
     <input type="hidden" name="confirm" value="1" />
+    <!--<input type="hidden" name="remove_rrd" value="<?php echo $_POST['remove_rrd']; ?>">-->
     <input type="submit" class="submit" name="Submit" value="Confirm host deletion" />
 
 <?php
@@ -36,7 +37,11 @@ else
 ?>
 
 <form name="form1" method="post" action="">
-  <p><select name="id">
+<?php print_error("Warning, this will remove the device from being monitered and if selected, all data will be removed as well!");?>
+<table border="0">
+  <tr>
+    <td>Device: </td>
+    <td><select name="id">
 
 <?php
 
@@ -46,10 +51,17 @@ foreach (dbFetchRows("SELECT * FROM `devices` ORDER BY `hostname`") as $data)
 }
 
 ?>
-    </select>
-    <input type="hidden" name="confirm" value="1" />
-    <input type="submit" class="submit" name="Submit" value="Delete Host" />
-</p>
+    </select></td>
+  </tr>
+ <!-- <tr>
+    <td>Remove RRDs (Data files): </td>
+    <td><input type="checkbox" name="remove_rrd" value="yes"></td>
+  </tr>-->
+  <tr>
+    <td colspan="2"><input id="confirm" type="hidden" name="confirm" value="0" />
+    <input id="confirm_delete" type="submit" class="submit" name="Submit" value="Delete Device" /></td>
+  </tr>
+</table>
 </form>
 <?php
 }