diff --git a/calendar/delete.php b/calendar/delete.php
index a4eb97c95f..659f666ce2 100755
--- a/calendar/delete.php
+++ b/calendar/delete.php
@@ -13,8 +13,7 @@
   \**************************************************************************/
 
   /* $Id$ */
-
-  $phpgw_flags["currentapp"] = "calendar";
+  $phpgw_flags = array("noheader" => True, "nonavbar" => True, "currentapp" => "calendar");
   include("../header.inc.php");
 
   if ($id > 0) {
@@ -31,4 +30,5 @@
      $phpgw->db->query("DELETE FROM webcal_entry_groups WHERE cal_id = $id");
   }
 
-  Header("Location: " . $phpgw->link("index.php,"year=$thisyear&month=$thismonth"));
+  Header("Location: " . $phpgw->link("index.php","year=$thisyear&month=$thismonth"));
+?>
\ No newline at end of file
diff --git a/calendar/edit_entry.php b/calendar/edit_entry.php
index 0a04e75078..577f9d69e5 100755
--- a/calendar/edit_entry.php
+++ b/calendar/edit_entry.php
@@ -121,7 +121,7 @@ function validate_and_submit() {
 <?php
   if ($can_edit) {
 ?>
-<FORM ACTION="<?php echo $phpgw->link("edit_entry_handler.php"); ?>" METHOD="GET" name="addform">
+<FORM ACTION="<?php echo $phpgw->link("edit_entry_handler.php"); ?>" METHOD="POST" name="addform">
 
 <?php if ($id) echo "<INPUT TYPE=\"hidden\" NAME=\"id\" VALUE=\"$id\">\n"; ?>