diff --git a/addressbook/delete.php b/addressbook/delete.php
index 9a0214487b..f4d3ffc3af 100755
--- a/addressbook/delete.php
+++ b/addressbook/delete.php
@@ -36,9 +36,7 @@
         <br><center><a href="<?php 
           echo $phpgw->link("view.php","&con=$con&order=$order&sort=$sort&filter=$filter&start=$start&query=$query");
           ?>"><?php echo lang_common("NO"); ?></a> &nbsp; &nbsp; &nbsp; &nbsp;
-        <a href="delete.php?sessionid=<?php
-            echo $phpgw->session->id . "&con=$con&confirm=true&order=$order&sort="
-	       . "$sort&filter=$filter&start=$start&query=$query"; 
+        <a href="<?php echo $phpgw->link("delete.php","con=$con&confirm=true&order=$order&sort=$sort&filter=$filter&start=$start&query=$query"); 
             ?>"><?php echo lang_common("YES"); ?></a><center>
      <?php
 
diff --git a/admin/killsession.php b/admin/killsession.php
index b6f6dde0bb..a707241aca 100755
--- a/admin/killsession.php
+++ b/admin/killsession.php
@@ -17,7 +17,7 @@
 
   $phpgw_flags["currentapp"] = "admin";
   include("../header.inc.php");
-  if ($ksessionid == $phpgw->session->id) {
+  if ($ksessionid == $phpgw_info["user"]["sessionid"]) {
      Header("Location: " . $phpgw->link("currentusers.php"));
      exit;
   }
diff --git a/admin/viewaccount.php b/admin/viewaccount.php
index 9b85dfbe32..fde83adb54 100755
--- a/admin/viewaccount.php
+++ b/admin/viewaccount.php
@@ -16,14 +16,13 @@
 
   include("../header.inc.php");
   if (! $con)
-     Header("Location: accounts.php?sessionid=" . $phpgw->session->id);
+     Header("Location: " . $phpgw->link("accounts.php"));
 
   $db_perms = $phpgw->accounts->read_apps($phpgw->db->f("loginid"));
 
   $phpgw->db->query("select * from accounts where con='$con'");
   $phpgw->db->next_record();
 
-
   ?>
    <center>
    <p><table border=0 width=50%>
diff --git a/calendar/delete.php b/calendar/delete.php
index 814e4e1a50..a4eb97c95f 100755
--- a/calendar/delete.php
+++ b/calendar/delete.php
@@ -31,5 +31,4 @@
      $phpgw->db->query("DELETE FROM webcal_entry_groups WHERE cal_id = $id");
   }
 
-  Header("Location: index.php?sessionid=" . $phpgw->session->id . "&"
-       . ($thisyear > 0 ? "year=$thisyear&month=$thismonth" : "") );
+  Header("Location: " . $phpgw->link("index.php,"year=$thisyear&month=$thismonth"));
diff --git a/calendar/index.php b/calendar/index.php
index 53d7434746..915d2d8820 100755
--- a/calendar/index.php
+++ b/calendar/index.php
@@ -84,10 +84,7 @@
 <FONT COLOR="<?php echo $H2COLOR;?>" SIZE="+1">
 <br>
 <?php
-    if ($phpgw->session->firstname)
-       echo $phpgw->session->firstname . " ";
-    if ($phpgw->session->lastname)
-       echo $phpgw->session->lastname;
+  echo $phpgw->common->display_fullname($phpgw_info["user"]["userid"],$phpgw_info["user"]["firstname"],$phpgw_info["user"]["lastname"]);
 ?>
 </FONT></TD>
 <?php
@@ -144,7 +141,7 @@
          } else {
             echo " BGCOLOR=\"$CELLBG\">";
          }
-         print_date_entries($date,$friendly,$phpgw->session->id);
+         print_date_entries($date,$friendly,$phpgw_info["user"]["sessionid"]);
          echo "</TD>\n";
       } else {
          echo "<TD></TD>\n";
diff --git a/calendar/search.php b/calendar/search.php
index 53c1e23286..d19d7316bb 100755
--- a/calendar/search.php
+++ b/calendar/search.php
@@ -78,8 +78,7 @@
   if (! strlen($error)) {
      arsort ($ids);
      for (reset($ids); $key = key($ids); next($ids)) {
-         echo "<LI><A HREF=\"view.php?sessionid=" . $phpgw->session->id
-            . "&id=$key\">" . $info[$key] . "</A>\n";
+         echo "<LI><A HREF=\"" . $phpgw->link("view.php","id=$key") . "\">" . $info[$key] . "</A>\n";
 
      }
   } else {
diff --git a/calendar/year.php b/calendar/year.php
index 2b5401a11e..1e63d74caa 100755
--- a/calendar/year.php
+++ b/calendar/year.php
@@ -29,8 +29,7 @@
  <tr>
   <?php
     if (! $friendly)
-       echo "<td align=\"left\"><A HREF=\"year.php?sessionid=" . $phpgw->session->id
-	  . "&year=" . ($year - 1) . "\">&lt;&lt;</A>";
+       echo "<td align=\"left\"><A HREF=\"" . $phpgw->link("year.php","year=" . ($year - 1)) . "\">&lt;&lt;</A>";
   ?>
   </td>
   </td>
@@ -39,8 +38,7 @@
   </td>
   <?php
     if (! $friendly)
-       echo "<td align=\"right\"><A HREF=\"year.php?sessionid=" . $phpgw->session->id
-	  . "&year=" . ($year + 1) . "\">&gt;&gt;</A>";
+       echo "<td align=\"right\"><A HREF=\"" . $phpgw->link("year.php","year=" . ($year + 1)) . "\">&gt;&gt;</A>";
   ?>
   </td>
  </tr>
@@ -65,8 +63,8 @@
 
 <?php
   if (! $friendly) {
-     echo "&nbsp;<A HREF=\"year.php?sessionid=" . $phpgw->session->id . "&friendly=1&"
-	. "&year=$year\"TARGET=\"cal_printer_friendly\" onMouseOver=\"window."
+     echo "&nbsp;<A HREF=\"" . $phpgw->link("year.php","friendly=1&"
+	. "&year=$year") . "\"TARGET=\"cal_printer_friendly\" onMouseOver=\"window."
 	. "status = '" . lang_calendar("Generate printer-friendly version") . "'\">["
 	. lang_calendar("Printer Friendly") . "]</A>";
   }