diff --git a/sql-files/main.sql b/sql-files/main.sql
index dc733686b6..6f59de4b51 100644
--- a/sql-files/main.sql
+++ b/sql-files/main.sql
@@ -570,13 +570,11 @@ CREATE TABLE `pet` (
 --
 
 DROP TABLE IF EXISTS `quest`;
-CREATE TABLE  `quest` (
-  `id` int(11) unsigned NOT NULL auto_increment,
-  `name` varchar(255) NOT NULL default '',
+CREATE TABLE `quest` (
   `char_id` int(11) unsigned NOT NULL default '0',
   `quest_id` int(10) unsigned NOT NULL,
   `state` enum('1','0') NOT NULL default '0',
-  PRIMARY KEY  (`id`)
+  PRIMARY KEY  USING BTREE (`char_id`,`quest_id`)
 ) ENGINE=MyISAM;
 
 --
@@ -584,13 +582,12 @@ CREATE TABLE  `quest` (
 --
 
 DROP TABLE IF EXISTS `quest_objective`;
-CREATE TABLE  `quest_objective` (
-  `id` int(11) unsigned NOT NULL auto_increment,
+CREATE TABLE `quest_objective` (
   `quest_id` int(11) unsigned NOT NULL,
   `count` mediumint(8) unsigned NOT NULL default '0',
   `name` varchar(255) NOT NULL default '',
   `num` tinyint(3) unsigned NOT NULL,
-  PRIMARY KEY  (`id`)
+  PRIMARY KEY  USING BTREE (`quest_id`,`num`)
 ) ENGINE=MyISAM;
 
 --
diff --git a/sql-files/upgrade_svn12545.sql b/sql-files/upgrade_svn12559.sql
similarity index 63%
rename from sql-files/upgrade_svn12545.sql
rename to sql-files/upgrade_svn12559.sql
index a3eadacf01..66f36a4685 100644
--- a/sql-files/upgrade_svn12545.sql
+++ b/sql-files/upgrade_svn12559.sql
@@ -3,13 +3,11 @@
 --
 
 DROP TABLE IF EXISTS `quest`;
-CREATE TABLE  `quest` (
-  `id` int(11) unsigned NOT NULL auto_increment,
-  `name` varchar(255) NOT NULL default '',
+CREATE TABLE `quest` (
   `char_id` int(11) unsigned NOT NULL default '0',
   `quest_id` int(10) unsigned NOT NULL,
   `state` enum('1','0') NOT NULL default '0',
-  PRIMARY KEY  (`id`)
+  PRIMARY KEY  USING BTREE (`char_id`,`quest_id`)
 ) ENGINE=MyISAM;
 
 --
@@ -17,11 +15,10 @@ CREATE TABLE  `quest` (
 --
 
 DROP TABLE IF EXISTS `quest_objective`;
-CREATE TABLE  `quest_objective` (
-  `id` int(11) unsigned NOT NULL auto_increment,
+CREATE TABLE `quest_objective` (
   `quest_id` int(11) unsigned NOT NULL,
   `count` mediumint(8) unsigned NOT NULL default '0',
   `name` varchar(255) NOT NULL default '',
   `num` tinyint(3) unsigned NOT NULL,
-  PRIMARY KEY  (`id`)
-) ENGINE=MyISAM;
\ No newline at end of file
+  PRIMARY KEY  USING BTREE (`quest_id`,`num`)
+) ENGINE=MyISAM;