diff --git a/html/pages/delhost.inc.php b/html/pages/delhost.inc.php
index ada573963a..ddb64bd2c8 100644
--- a/html/pages/delhost.inc.php
+++ b/html/pages/delhost.inc.php
@@ -1,3 +1,5 @@
+<h1>Delete Host</h1>
+
 <?php
 
 if ($_SESSION['userlevel'] < 10)
@@ -6,16 +8,31 @@ if ($_SESSION['userlevel'] < 10)
   exit;
 }
 
-if ($_REQUEST['id'])
+if (is_numeric($_REQUEST['id']))
 {
-  echo(delete_device(mres($_REQUEST['id'])));
-}
+  if ($_REQUEST['confirm'])
+  {
+    print_message(delete_device(mres($_REQUEST['id'])));
+  }
+  else
+  {
+    $device = device_by_id_cache($_REQUEST['id']);
+    print_message("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="submit" class="submit" name="Submit" value="Confirm host deletion" />
 
+<?php
+  }
+}
+else
+{
 ?>
 
 <form name="form1" method="post" action="">
-  <h1>Delete Host</h1>
-  <br />
   <p><select name="id">
 
 <?php
@@ -27,7 +44,10 @@ foreach (dbFetchRows("SELECT * FROM `devices` ORDER BY `hostname`") as $data)
 
 ?>
     </select>
-
-    <input type="submit" class="submit" name="Submit" value="Delete Host">
+    <input type="hidden" name="confirm" value="1" />
+    <input type="submit" class="submit" name="Submit" value="Delete Host" />
 </p>
 </form>
+<?php
+}
+?>
diff --git a/html/pages/device/edit/device.inc.php b/html/pages/device/edit/device.inc.php
index ee00ee224f..bf427a8f1d 100644
--- a/html/pages/device/edit/device.inc.php
+++ b/html/pages/device/edit/device.inc.php
@@ -64,7 +64,7 @@ if ($updated && $update_message)
   <tr>
     <td>
       <h5>
-        <form id="delete_host" name="delete_host" method="post" action="<?php echo($config['base_url'].'/delhost/'); ?>">
+        <form id="delete_host" name="delete_host" method="post" action="delhost/">
           <img src="images/16/server_delete.png" align="absmiddle">
           <input type="hidden" name="id" value="<?php echo($device['device_id']); ?>">
           <input type="submit" class="submit" name="Submit" value="Delete device">