diff --git a/database/database.mysql b/database/database.mysql
index 5a5dac52aaf46dd03022f52bac57fb722e6b0d9a..38f8bb272749595ba7a948e387532dc6ea8b84da 100644
--- a/database/database.mysql
+++ b/database/database.mysql
@@ -335,8 +335,8 @@ CREATE TABLE forum (
   nid int(10) unsigned NOT NULL default '0',
   vid int(10) unsigned NOT NULL default '0',
   tid int(10) unsigned NOT NULL default '0',
-  PRIMARY KEY (nid),
-  KEY vid (vid),
+  PRIMARY KEY (vid),
+  KEY nid (nid),
   KEY tid (tid)
 ) TYPE=MyISAM
 /*!40100 DEFAULT CHARACTER SET utf8 */ ;
diff --git a/database/database.pgsql b/database/database.pgsql
index 8d8925729a9fd8d7783016a348f0d1a8e4a71d3f..80f1e8199e5171a9c04fc327fe3084482fb80db9 100644
--- a/database/database.pgsql
+++ b/database/database.pgsql
@@ -318,10 +318,10 @@ CREATE TABLE forum (
   nid integer NOT NULL default '0',
   vid integer NOT NULL default '0',
   tid integer NOT NULL default '0',
-  PRIMARY KEY (nid)
+  PRIMARY KEY (vid)
 );
 CREATE INDEX forum_tid_idx ON forum(tid);
-CREATE INDEX forum_vid_idx ON forum(vid);
+CREATE INDEX forum_vid_idx ON forum(nid);
 
 --
 -- Table structure for history