diff --git a/setup/sql/mysql_droptables.inc.php b/setup/sql/mysql_droptables.inc.php
index f9e079686d..e0c410fba7 100644
--- a/setup/sql/mysql_droptables.inc.php
+++ b/setup/sql/mysql_droptables.inc.php
@@ -13,7 +13,7 @@
 
   $phpgw_setup->db->query("DROP TABLE config");
   $phpgw_setup->db->query("DROP TABLE applications");
-  $phpgw_setup->db->query("DROP TABLE accounts");
+  $phpgw_setup->db->query("DROP TABLE phpgw_accounts");
   $phpgw_setup->db->query("DROP TABLE groups");
   $phpgw_setup->db->query("DROP TABLE preferences");
   $phpgw_setup->db->query("DROP TABLE phpgw_sessions");
diff --git a/setup/sql/pgsql_droptables.inc.php b/setup/sql/pgsql_droptables.inc.php
index 3a67037af0..331d0d3051 100644
--- a/setup/sql/pgsql_droptables.inc.php
+++ b/setup/sql/pgsql_droptables.inc.php
@@ -13,8 +13,8 @@
 
   $phpgw_setup->db->query("DROP TABLE config");
   $phpgw_setup->db->query("DROP TABLE applications");
-  $phpgw_setup->db->query("drop sequence accounts_account_id_seq");
-  $phpgw_setup->db->query("DROP TABLE accounts");
+  $phpgw_setup->db->query("drop sequence phpgw_accounts_account_id_seq");
+  $phpgw_setup->db->query("DROP TABLE phpgw_accounts");
   $phpgw_setup->db->query("drop sequence groups_group_id_seq");
   $phpgw_setup->db->query("DROP TABLE groups");
   $phpgw_setup->db->query("DROP TABLE preferences");
diff --git a/setup/sql/pgsql_upgrade_beta.inc.php b/setup/sql/pgsql_upgrade_beta.inc.php
index 5d87c7a832..680f1fa4e5 100644
--- a/setup/sql/pgsql_upgrade_beta.inc.php
+++ b/setup/sql/pgsql_upgrade_beta.inc.php
@@ -921,6 +921,7 @@
 
      $phpgw_setup->db->query("insert into phpgw_accounts select * from phpgw_temp",__LINE__,__FILE__);
      $phpgw_setup->db->query("drop table phpgw_temp",__LINE__,__FILE__);
+     $phpgw_setup->db->query("drop sequence acccount_account_id_seq");
      $phpgw_setup->db->query("alter table accounts rename phpgw_accounts",__LINE__,__FILE__);
 
      $phpgw_info["setup"]["currentver"]["phpgwapi"] = "0.9.10pre4";