diff --git a/admin/accounts.php b/admin/accounts.php
index ef1abf86e5..0d15901f29 100755
--- a/admin/accounts.php
+++ b/admin/accounts.php
@@ -96,7 +96,7 @@
 
   }
 
-  $t->set_var("hidden_vars",$phpgw->session->hidden_var());
+  $t->set_var("actionurl",$phpgw->link("newaccount.php"));
   $t->set_var("lang_add",lang_common("add"));
   $t->set_var("lang_search",lang_common("search"));
 
diff --git a/admin/applications.php b/admin/applications.php
index 58e78e3354..d7339e63a5 100644
--- a/admin/applications.php
+++ b/admin/applications.php
@@ -58,8 +58,7 @@
     echo "</td></tr>\n";
   }
 
-  echo "</form></table><form method=POST action=\"newapplication.php\">"
-     . $phpgw->session->hidden_var()
+  echo "</form></table><form method=POST action=\"".$phpgw->link("newapplication.php")."\">"
      . "<table border=0 width=45% align=center><tr><td align=left><input type=\"submit\" "
      . "value=\"" . lang_common("Add") . "\"></td></tr></table></form>";
 
diff --git a/admin/editaccount.php b/admin/editaccount.php
index 9e73f369ea..577b8fb644 100755
--- a/admin/editaccount.php
+++ b/admin/editaccount.php
@@ -122,8 +122,7 @@
   $account_status = $phpgw->db->f("status");
   ?>
 
-     <form method="POST" action="editaccount.php">
-      <?php echo $phpgw->session->hidden_var(); ?>
+     <form method="POST" action="<?php echo $phpgw->link("editaccount.php"); ?>">
       <input type="hidden" name="con" value="<? echo $con; ?>">
        <?php
          if ($error) {
diff --git a/admin/editapplication.php b/admin/editapplication.php
index ae75761307..1d0fc9191a 100644
--- a/admin/editapplication.php
+++ b/admin/editapplication.php
@@ -48,11 +48,11 @@
   } else {
      $t->set_var("error","");
   }
-  $t->set_var("session_hidden_var",$phpgw->session->hidden_var()
-						. '<input type="hidden" name="old_app_name" value="'
-						. $phpgw->db->f("app_name") . '">');
+  $t->set_var("session_hidden_var","<input type=\"hidden\" "
+				 . "name=\"old_app_name\" value=\""
+				 . $phpgw->db->f("app_name") . "\">");
 
-  $t->set_var("form_action","editapplication.php");
+  $t->set_var("form_action",$phpgw->link("editapplication.php"));
   $t->set_var("lang_app_name",lang_admin("application name"));
   $t->set_var("lang_app_title",lang_admin("application title"));
   $t->set_var("lang_enabled",lang_admin("enabled"));
diff --git a/admin/editgroup.php b/admin/editgroup.php
index fedf9f0213..aad86369f0 100755
--- a/admin/editgroup.php
+++ b/admin/editgroup.php
@@ -119,9 +119,8 @@
   $phpgw->db->query("select * from groups where group_id='$group_id'");
   $phpgw->db->next_record();
 
-  $t->set_var("form_action","editgroup.php");
-  $t->set_var("hidden_vars",$phpgw->session->hidden_var()
-				  . '<input type="hidden" name="group_id" value="' . $group_id . '">');
+  $t->set_var("form_action",$phpgw->link("editgroup.php"));
+  $t->set_var("hidden_vars","<input type=\"hidden\" name=\"group_id\" value=\"" . $group_id . "\">");
 
   $t->set_var("lang_group_name",lang_admin("group name"));
   $t->set_var("group_name_value",$phpgw->db->f("group_name"));
diff --git a/admin/editheadline.php b/admin/editheadline.php
index 0057d361d3..930f46ef58 100755
--- a/admin/editheadline.php
+++ b/admin/editheadline.php
@@ -27,8 +27,7 @@
 
      ?>
 
-     <form method="POST" action="editheadline.php">
-      <?php echo $phpgw->session->hidden_var(); ?>
+     <form method="POST" action="<?php echo $phpgw->link("editheadline.php"); ?>">
       <input type="hidden" name="o_con" value="<? echo $con; ?>">
 
       <center>
diff --git a/admin/groups.php b/admin/groups.php
index 80a9a0e4a3..193ea1ce01 100755
--- a/admin/groups.php
+++ b/admin/groups.php
@@ -64,11 +64,11 @@
        . "\"> " . lang_common("Delete") . " </a></td>";
   }
 
-  echo "\n<form method=POST action=\"newgroup.php\">"
-     . $phpgw->session->hidden_var() . "</table></center>"
+  echo "\n<form method=POST action=\"".$phpgw->link("newgroup.php")."\">"
+     . "</table></center>"
      . "<table border=0 width=45% align=center><tr><td align=left><input type=\"submit\" "
-     . "value=\"" . lang_common("Add") . "\"></form><form action=\"groups.php\"></td>"
-     . $phpgw->session->hidden_var() . "<td align=right>" . lang_common("search") . "&nbsp;"
+     . "value=\"" . lang_common("Add") . "\"></form><form action=\"".$phpgw->link("groups.php")."\"></td>"
+     . "<td align=right>" . lang_common("search") . "&nbsp;"
      . "<input name=\"query\"></td></tr></form></table>";
 
   include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
diff --git a/admin/headlines.php b/admin/headlines.php
index 73442a429a..640de7f80f 100755
--- a/admin/headlines.php
+++ b/admin/headlines.php
@@ -38,8 +38,7 @@
     echo  "<td width=5%><a href=\"".$phpgw->link("viewheadline.php",
          "con=".$phpgw->db->f("con"))."\"> ".lang_common("View")." </a> </td></tr>\n";
   }
-  echo "<form method=POST action=\"newheadline.php\">"
-     . $phpgw->session->hidden_var()
+  echo "<form method=POST action=\"".$phpgw->link("newheadline.php")."\">"
      . "<tr><td colspan=\"5\"><input type=\"submit\" value=\"".lang_common("Add")
      . "\"></td></tr></form></table></center>";
 
diff --git a/admin/newaccount.php b/admin/newaccount.php
index 467123cf4d..fde4f205ad 100755
--- a/admin/newaccount.php
+++ b/admin/newaccount.php
@@ -90,8 +90,7 @@
      $phpgw->common->header();
      $phpgw->common->navbar();
      ?>
-       <form method="POST" action="newaccount.php">
-       <?php echo $phpgw->session->hidden_var(); ?>
+       <form method="POST" action="<?php echo $phpgw->link("newaccount.php"); ?>">
        <?php
          if ($error) {
             echo "<center>" . lang_common("Error") . ":$error</center>";
diff --git a/admin/newapplication.php b/admin/newapplication.php
index b31cfcc0fe..fecc7b0d96 100644
--- a/admin/newapplication.php
+++ b/admin/newapplication.php
@@ -47,8 +47,8 @@
      $t->set_var("error","");
   }
 
-  $t->set_var("session_hidden_var",$phpgw->session->hidden_var());
-  $t->set_var("form_action","newapplication.php");
+  $t->set_var("session_hidden_var","");
+  $t->set_var("form_action",$phpgw->link("newapplication.php"));
   $t->set_var("lang_app_name",lang_admin("application name"));
   $t->set_var("lang_app_title",lang_admin("application title"));
   $t->set_var("lang_enabled",lang_admin("enabled"));
diff --git a/admin/newgroup.php b/admin/newgroup.php
index 06aa3430db..11ac8227dd 100755
--- a/admin/newgroup.php
+++ b/admin/newgroup.php
@@ -71,8 +71,8 @@
      $t->set_var("error","");
   }
 
-  $t->set_var("form_action","newgroup.php");
-  $t->set_var("hidden_vars",$phpgw->session->hidden_var());
+  $t->set_var("form_action",$phpgw->link("newgroup.php"));
+  $t->set_var("hidden_vars","");
   $t->set_var("lang_group_name",lang_admin("New group name"));
   $t->set_var("group_name_value","");
 
diff --git a/admin/newheadline.php b/admin/newheadline.php
index 648bfa8d8e..a8792a10bf 100755
--- a/admin/newheadline.php
+++ b/admin/newheadline.php
@@ -18,9 +18,7 @@
   include("../header.inc.php");
   if (! $submit) {
      ?>
-       <form method="POST" action="newheadline.php">
-       <?php echo $phpgw->session->hidden_var(); ?>
-
+       <form method="POST" action="<?php echo $phpgw->link("newheadline.php"); ?>">
         <center>
          <table border=0 width=65%>
            <tr>
diff --git a/admin/nntp.php b/admin/nntp.php
index 9b007c803c..1b2157e4ba 100755
--- a/admin/nntp.php
+++ b/admin/nntp.php
@@ -94,8 +94,7 @@
      
     $urlname = $phpgw_info["server"]["webserver_url"]."/admin/nntp.php";
 
-    $common_hidden_vars = $phpgw->session->hidden_var() . "\n"
-		        . "<input type=\"hidden\" name=\"start\" value=\"".$start."\">\n"
+    $common_hidden_vars = "<input type=\"hidden\" name=\"start\" value=\"".$start."\">\n"
 		        . "<input type=\"hidden\" name=\"stop\" value=\""
 			. ($start + $phpgw_info["user"]["preferences"]["maxmatchs"])."\">\n"
 		        . "<input type=\"hidden\" name=\"tg\" value=\"".$tg."\">\n"