diff --git a/html/pages/delhost.inc.php b/html/pages/delhost.inc.php
index c4676640c..5d3874af8 100644
--- a/html/pages/delhost.inc.php
+++ b/html/pages/delhost.inc.php
@@ -11,13 +11,11 @@ if ($_REQUEST['id'])
   echo(delete_device(mres($_REQUEST['id'])));
 }
 
-?>
 
-<form name="form1" method="post" action="?page=delhost">
+echo('<form name="form1" method="post" action='.$config['base_url'].'"/delhost/">
   <h1>Delete Host</h1>
   <br />
-  <p><select name="id">
-<?php
+  <p><select name="id">');
 
 $query = mysql_query("SELECT * FROM `devices` ORDER BY `hostname`");
 
diff --git a/html/pages/device/edit/device.inc.php b/html/pages/device/edit/device.inc.php
index 93616b2af..1b0497e91 100644
--- a/html/pages/device/edit/device.inc.php
+++ b/html/pages/device/edit/device.inc.php
@@ -65,10 +65,16 @@ if ($updated && $update_message)
   <tr>
     <td>
       <h5>
-        <a href="?page=delhost&id="<?php echo($device['device_id']) ?>">
-          <img src="images/16/server_delete.png" align="absmiddle">
-          Delete
-        </a>
+<?php
+
+        echo("
+              <form id='delete_host' name='delete_host' method='post' action='".$config['base_url']."/delhost/'>
+                <img src='images/16/server_delete.png' align='absmiddle'>
+                <input type=hidden name=id value='".$device['device_id']."'>
+		<input type=submit class=submit name='Submit' value='Delete Host'>
+              </form>");
+
+?>
       </h5>
 
 <form id="edit" name="edit" method="post" action="">