diff --git a/addressbook/preferences.php b/addressbook/preferences.php
index d92342e9b8..c0329635c8 100644
--- a/addressbook/preferences.php
+++ b/addressbook/preferences.php
@@ -27,10 +27,10 @@
      
      if (! $totalerrors) {
         while ($pref = each($ab_selected)) {
-          $phpgw->preferences->change($phpgw_info["user"]["account_id"],$pref[0],"addressbook","addressbook_" . $pref[1]);
+          $phpgw->preferences->change("addressbook",$pref[0],"addressbook_" . $pref[1]);
         }
         if ($mainscreen_showbirthdays) {
-           $phpgw->preferences->change($phpgw_info["user"]["account_id"],"mainscreen_showbirthdays","addressbook");
+           $phpgw->preferences->change("addressbook","mainscreen_showbirthdays");
         } else {
            $phpgw->preferences->delete("addressbook","mainscreen_showbirthdays");
         }
diff --git a/calendar/preferences.php b/calendar/preferences.php
index bc22f88b6e..d55817306d 100644
--- a/calendar/preferences.php
+++ b/calendar/preferences.php
@@ -18,13 +18,13 @@
   include("../header.inc.php");
 
   if ($submit) {
-     $phpgw->preferences->change($phpgw_info["user"]["account_id"],"weekdaystarts","calendar");
-     $phpgw->preferences->change($phpgw_info["user"]["account_id"],"workdaystarts","calendar");
-     $phpgw->preferences->change($phpgw_info["user"]["account_id"],"workdayends","calendar");
-     $phpgw->preferences->change($phpgw_info["user"]["account_id"],"defaultcalendar","common");
-     $phpgw->preferences->change($phpgw_info["user"]["account_id"],"defaultfilter","calendar");
+     $phpgw->preferences->change("calendar","weekdaystarts");
+     $phpgw->preferences->change("calendar","workdaystarts");
+     $phpgw->preferences->change("calendar","workdayends");
+     $phpgw->preferences->change("calendar","defaultcalendar");
+     $phpgw->preferences->change("calendar","defaultfilter");
      if ($mainscreen_showevents) {
-        $phpgw->preferences->change($phpgw_info["user"]["account_id"],"mainscreen_showevents","calendar");
+        $phpgw->preferences->change("calendar","mainscreen_showevents");
      } else {
         $phpgw->preferences->delete("calendar","mainscreen_showevents");
      }