diff --git a/calendar/inc/footer.inc.php b/calendar/inc/footer.inc.php
index cf48b4e3c1..60a4c3ec69 100644
--- a/calendar/inc/footer.inc.php
+++ b/calendar/inc/footer.inc.php
@@ -23,7 +23,7 @@
        <FONT SIZE="-1">
 
        <TABLE BORDER=0 WIDTH=100% CELLPADDING=0 CELLSPACING=0>
-        <FORM ACTION="<?php echo $phpgw->link("index.php"); ?>" method="post" name="SelectMonth">
+        <FORM ACTION="<?php echo $phpgw->link("month.php"); ?>" method="post" name="SelectMonth">
         <TR>
          <TD VALIGN="top" WIDTH=33%><FONT SIZE="-1">
           <B><?php echo lang("Month"); ?>:</B>
diff --git a/calendar/inc/header.inc.php b/calendar/inc/header.inc.php
index be48fa5612..3a7944c40e 100644
--- a/calendar/inc/header.inc.php
+++ b/calendar/inc/header.inc.php
@@ -64,7 +64,7 @@
    </a>
   </td>
   <td width="2%" align="left">
-   <a href="<?php echo $phpgw->link("index.php","day=".$phpgw->calendar->today["day"]."&month=".$phpgw->calendar->today["month"]."&year=".$phpgw->calendar->today["year"]); ?>">
+   <a href="<?php echo $phpgw->link("month.php","day=".$phpgw->calendar->today["day"]."&month=".$phpgw->calendar->today["month"]."&year=".$phpgw->calendar->today["year"]); ?>">
     <img src="<?php echo $phpgw_info["server"]["app_images"]; ?>/month.gif" alt="<?php echo lang("This month"); ?>" border="0">
    </a>
   </td>
@@ -78,7 +78,7 @@
     <img src="<?php echo $phpgw_info["server"]["app_images"]; ?>/view.gif" alt="<?php echo lang("Daily Matrix View"); ?>" border="0">
    </a>
   </td>
-  <form action="<?php echo $phpgw->link(""); ?>" method="POST" name="filtermethod">
+  <form action="<?php echo $phpgw->link(); ?>" method="POST" name="filtermethod">
    <td width="55%" align="center" valign="center">
     <b><?php echo lang("Filter"); ?>:</b>
     <input type="hidden" name="from" value="<?php echo $PHP_SELF; ?>">