diff --git a/addressbook/inc/functions.inc.php b/addressbook/inc/functions.inc.php
index c076b16b4a..f04bf811a0 100755
--- a/addressbook/inc/functions.inc.php
+++ b/addressbook/inc/functions.inc.php
@@ -103,8 +103,7 @@
   }
 
   if ($action) {
-     echo "<FORM action=\"$action\" method=\"post\">\n"
-        . $phpgw->session->hidden_var();
+     echo "<FORM action=\"".$phpgw->link($action)."\" method=\"post\">\n";
   }
 
   ?>
diff --git a/addressbook/index.php b/addressbook/index.php
index 10d666a245..56c23589cb 100755
--- a/addressbook/index.php
+++ b/addressbook/index.php
@@ -166,8 +166,7 @@
 ?>
   </table>
 
-  <form method="POST" action="add.php">
-   <?php echo $phpgw->session->hidden_var(); ?>
+  <form method="POST" action="<?php echo $phpgw->link("add.php"); ?>">
    <input type="hidden" name="sort" value="<?php echo $sort; ?>">
    <input type="hidden" name="order" value="<?php echo $order; ?>">
    <input type="hidden" name="query" value="<?php echo $query; ?>">
diff --git a/calendar/edit_entry.php b/calendar/edit_entry.php
index ff44f487d6..0b6fd4c039 100755
--- a/calendar/edit_entry.php
+++ b/calendar/edit_entry.php
@@ -116,8 +116,7 @@ function validate_and_submit() {
 <?php
   if ($can_edit) {
 ?>
-<FORM ACTION="edit_entry_handler.php" METHOD="GET" name="addform">
-<? echo $phpgw->session->hidden_var(); ?>
+<FORM ACTION="<?php echo $phpgw->link("edit_entry_handler.php"); ?>" METHOD="GET" name="addform">
 
 <?php if ($id) echo "<INPUT TYPE=\"hidden\" NAME=\"id\" VALUE=\"$id\">\n"; ?>
 
diff --git a/calendar/inc/footer.inc.php b/calendar/inc/footer.inc.php
index 3cbac3ecab..7cf49d2d62 100644
--- a/calendar/inc/footer.inc.php
+++ b/calendar/inc/footer.inc.php
@@ -22,8 +22,7 @@
 <HR CLEAR="all">
 <FONT SIZE="-1">
 <TABLE BORDER=0 WIDTH=100% CELLPADDING=0 CELLSPACING=0>
-<FORM ACTION="index.php" METHOD="GET" NAME="SelectMonth">
-<?php echo $phpgw->session->hidden_var(); ?>
+<FORM ACTION="<?php echo $phpgw->link("index.php"); ?>" METHOD="GET" NAME="SelectMonth">
 
 <TR><TD VALIGN="top" WIDTH=33%><FONT SIZE="-1">
 <B><?php echo lang_calendar("Month"); ?>:</B>
@@ -59,8 +58,7 @@
 </FONT></TD>
 </FORM>
 
-<FORM ACTION="week.php" METHOD="GET" NAME="SelectWeek">
-<?php echo $phpgw->session->hidden_var(); ?>
+<FORM ACTION="<?php echo $phpgw->link("week.php"); ?>" METHOD="GET" NAME="SelectWeek">
 
 <TD VALIGN="top" align="center" WIDTH=33%><FONT SIZE="-1">
 <B><?php echo lang_calendar("Week"); ?>:</B>
@@ -103,8 +101,7 @@
 
 <FONT SIZE="-1">
 
-<FORM ACTION="year.php" METHOD="GET" NAME="SelectYear">
-<?php echo $phpgw->session->hidden_var(); ?>
+<FORM ACTION="<?php echo $phpgw->link("year.php"); ?>" METHOD="GET" NAME="SelectYear">
 
 <TD VALIGN="top" align="right" WIDTH=33%><FONT SIZE="-1">
 <B><?php echo lang_calendar("Year"); ?>:</B>
diff --git a/calendar/inc/header.inc.php b/calendar/inc/header.inc.php
index d10e98de5b..538224aa7e 100644
--- a/calendar/inc/header.inc.php
+++ b/calendar/inc/header.inc.php
@@ -19,8 +19,7 @@
    </a>
   </td>
   <td align="right">
-   <form action="search.php">
-    <?php echo $phpgw->session->hidden_var(); ?>
+   <form action="<?php echo $phpgw->link("search.php"); ?>">
     <input type="hidden" name="from" value="<?php echo $PHP_SELF; ?>">
     <input type="hidden" name="date" value="<?php echo $date; ?>">
     <input type="hidden" name="month" value="<?php echo $thismonth; ?>">