diff --git a/html/pages/delhost.inc.php b/html/pages/delhost.inc.php
index 5d3874af83..ae8bdfaffe 100644
--- a/html/pages/delhost.inc.php
+++ b/html/pages/delhost.inc.php
@@ -11,11 +11,14 @@ if ($_REQUEST['id'])
   echo(delete_device(mres($_REQUEST['id'])));
 }
 
+?>
 
-echo('<form name="form1" method="post" action='.$config['base_url'].'"/delhost/">
+<form name="form1" method="post" action="">
   <h1>Delete Host</h1>
   <br />
-  <p><select name="id">');
+  <p><select name="id">
+
+<?php
 
 $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 1b0497e913..15fa08e15b 100644
--- a/html/pages/device/edit/device.inc.php
+++ b/html/pages/device/edit/device.inc.php
@@ -65,16 +65,11 @@ if ($updated && $update_message)
   <tr>
     <td>
       <h5>
-<?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>");
-
-?>
+        <form id="delete_host" name="delete_host" method="post" action="">
+          <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 Host">
+        </form>
       </h5>
 
 <form id="edit" name="edit" method="post" action="">