diff --git a/setup/sql/common_default_records.inc.php b/setup/sql/common_default_records.inc.php
index 295f141808..7a0d5ae15f 100644
--- a/setup/sql/common_default_records.inc.php
+++ b/setup/sql/common_default_records.inc.php
@@ -104,19 +104,8 @@
 
   $db->query("insert into groups (group_name) values ('Default')");  
   $db->query("insert into accounts (account_lid,account_pwd,account_firstname,account_lastname,account_permissions,account_groups,account_status) values ('demo','81dc9bdb52d04dc20036dbd8313ed055','Demo','Account',':admin:email:todo:addressbook:calendar:',',1:0,','A')");
-  
-  $db->query("insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('1','maxmatchs','10','common')");
-  $db->query("insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('1','timeformat','12','common')");
-  $db->query("insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('1','dateformat','m/d/Y','common')");
-  $db->query("insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('1','theme','default','common')");
-  $db->query("insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('1','tz_offset','0','common')");
-  $db->query("insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('1','lang','en','common')");
-  $db->query("insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('1','firstname','True','addressbook')");
-  $db->query("insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('1','lastname','True','addressbook')");
-  $db->query("insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('1','company','True','addressbook')");
-  $db->query("insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('1','calendar','workdaystarts','8')");
-  $db->query("insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('1','calendar','workdayends','15')");
-  $db->query("insert into preferences (preference_owner, preference_name, preference_value, preference_appname) values ('1','calendar','weekdaystarts','Monday')");
+
+  $db->query("insert into preferences (preference_owner, preference_value) values ('1','a:5:{s:6:"common";a:1:{s:0:"";s:2:"en";}s:11:"addressbook";a:1:{s:0:"";s:4:"True";}i:8;a:1:{s:0:"";s:13:"workdaystarts";}i:15;a:1:{s:0:"";s:11:"workdayends";}s:6:"Monday";a:1:{s:0:"";s:13:"weekdaystarts";}}');
 
   @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('aa','Afar','No')");
   @$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ab','Abkhazian','No')");
diff --git a/setup/sql/mysql_newtables.inc.php b/setup/sql/mysql_newtables.inc.php
index 8f4d6107cc..4b78dfc9b0 100644
--- a/setup/sql/mysql_newtables.inc.php
+++ b/setup/sql/mysql_newtables.inc.php
@@ -57,20 +57,18 @@
   $db->query($sql);  
 
   $sql = "CREATE TABLE preferences (
-    preference_owner   varchar(20),
-    preference_name    varchar(50),
-    preference_value   varchar(50),
-    preference_appname varchar(50)
+    preference_owner       int,
+    preference_value       text
   )";
   $db->query($sql);  
 
   $sql = "CREATE TABLE phpgw_sessions (
     session_id        varchar(255) NOT NULL,
     session_lid       varchar(255),
-    session_pwd       varchar(255),
     session_ip        varchar(255),
     session_logintime int(11),
     session_dla       int(11),
+    session_info      text,
     UNIQUE sessionid (session_id)
   )";
   $db->query($sql);  
@@ -291,7 +289,7 @@
           )";
   $db->query($sql);
 
-  $currentver = "0.9.7";
+  $currentver = "0.9.8pre3";
   $oldversion = $currentver;
   update_version_table();
 ?>
diff --git a/setup/sql/mysql_upgrade_beta.inc.php b/setup/sql/mysql_upgrade_beta.inc.php
index ba36e05fbc..4aebcb16de 100644
--- a/setup/sql/mysql_upgrade_beta.inc.php
+++ b/setup/sql/mysql_upgrade_beta.inc.php
@@ -770,6 +770,18 @@
         )";
         @$db->query($sql);
 
+      	$db->query("DROP TABLE phpgw_sessions",__LINE__,__FILE__);
+        $sql = "CREATE TABLE phpgw_sessions (
+          session_id        varchar(255) NOT NULL,
+          session_lid       varchar(255),
+          session_ip        varchar(255),
+          session_logintime int(11),
+          session_dla       int(11),
+          session_info      text,
+          UNIQUE sessionid (session_id)
+        )";
+        $db->query($sql);  
+
         // upgrade code ends here
         $currentver = "0.9.8pre3";
         update_version_table();
diff --git a/setup/sql/pgsql_newtables.inc.php b/setup/sql/pgsql_newtables.inc.php
index 21f4718006..cd094eeec6 100644
--- a/setup/sql/pgsql_newtables.inc.php
+++ b/setup/sql/pgsql_newtables.inc.php
@@ -92,10 +92,8 @@
   $db->query($sql);
 
   $sql = "create table preferences ( 
-    preference_owner       varchar(20),
-    preference_name        varchar(50),
-    preference_value       varchar(50),
-    preference_appname     varchar(50)
+    preference_owner       int,
+    preference_value       text
   )";
   $db->query($sql);
 
@@ -262,7 +260,7 @@
           )";
   $db->query($sql);
 
-  $currentver = "0.9.7";
+  $currentver = "0.9.8pre3";
   $oldversion = $currentver;
   update_version_table();
 ?>
diff --git a/setup/sql/pgsql_upgrade_beta.inc.php b/setup/sql/pgsql_upgrade_beta.inc.php
index 70b73f3a25..0074ce9c04 100644
--- a/setup/sql/pgsql_upgrade_beta.inc.php
+++ b/setup/sql/pgsql_upgrade_beta.inc.php
@@ -784,6 +784,18 @@
         )";
         @$db->query($sql);
 
+      	$db->query("DROP TABLE phpgw_sessions",__LINE__,__FILE__);
+        $sql = "create table phpgw_sessions (
+          session_id         varchar(255),
+          session_lid        varchar(255),
+          session_ip         varchar(255),
+          session_logintime  int,
+          session_dla        int,
+          session_info       text,
+          unique(session_id)
+        )";
+        $db->query($sql);
+
         // upgrade code ends here
         $currentver = "0.9.8pre3";
         update_version_table();