diff --git a/lib/upgrades/UpgradeFunctions.inc.php b/lib/upgrades/UpgradeFunctions.inc.php
index 8c7995b..f4c4abc 100644
--- a/lib/upgrades/UpgradeFunctions.inc.php
+++ b/lib/upgrades/UpgradeFunctions.inc.php
@@ -1068,6 +1068,11 @@ class UpgradeFunctions {
             $ini->addItem('DiskUsage', 'warningThreshold', '10', "When free space in a mount point is less than this percentage,\r\n; the disk usage dashlet will highlight the mount in ORANGE", "settings for the Disk Usage dashlet");
             $ini->addItem('DiskUsage', 'urgentThreshold', '5', "When free space in a mount point is less than this percentage,\r\n; the disk usage dashlet will highlight the mount in RED");
 
+            // CustomErrorMessages Section
+            $ini->addItem('CustomErrorMessages', 'customerrormessages', 'on', 'Turn custom error messages on or off here (account wide)');
+            $ini->addItem('CustomErrorMessages', 'customerrorpagepath', 'customerrorpage.php', 'Name or url of custom error page');
+            $ini->addItem('CustomErrorMessages', 'customerrorhandler', 'on', 'Turn custom error handler on or off');
+
             $ini->write();
         }
     }
diff --git a/sql/mysql/install/data.sql b/sql/mysql/install/data.sql
index ea6c0a5..91d8231 100644
--- a/sql/mysql/install/data.sql
+++ b/sql/mysql/install/data.sql
@@ -968,7 +968,8 @@ INSERT INTO `upgrades` VALUES (1,'sql*2.0.6*0*2.0.6/create_upgrade_table.sql','D
 (170,'sql*3.5.2*0*3.5.2/plugins_orderby.sql','Plugins orderby update','2007-11-21 00:00:00',1,'upgrade*3.5.2*99*upgrade3.5.2'),
 (171,'sql*3.5.2*0*3.5.2/document_link.sql','Document Link update','2007-11-21 00:00:00',1,'upgrade*3.5.2*99*upgrade3.5.2'),
 (172,'sql*3.5.2*0*3.5.2/index_file_status_message.sql','Index file status message update','2007-11-21 00:00:00',1,'upgrade*3.5.2*99*upgrade3.5.2'),
-(173,'upgrade*3.5.2*99*upgrade3.5.2','Upgrade from version 3.5.1 to 3.5.2','2007-11-21 00:00:00',1,'upgrade*3.5.2*99*upgrade3.5.2');
+(173,'sql*3.5.2*0*3.5.2/clean_plugin_helper.sql','Clean out the plugin helper table.','2007-11-21 00:00:00',1,'upgrade*3.5.2*99*upgrade3.5.2'),
+(174,'upgrade*3.5.2*99*upgrade3.5.2','Upgrade from version 3.5.1 to 3.5.2','2007-11-21 00:00:00',1,'upgrade*3.5.2*99*upgrade3.5.2');
 /*!40000 ALTER TABLE `upgrades` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1825,7 +1826,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `zseq_upgrades` WRITE;
 /*!40000 ALTER TABLE `zseq_upgrades` DISABLE KEYS */;
-INSERT INTO `zseq_upgrades` VALUES (173);
+INSERT INTO `zseq_upgrades` VALUES (174);
 /*!40000 ALTER TABLE `zseq_upgrades` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/sql/mysql/upgrade/3.5.2/clean_plugin_helper.sql b/sql/mysql/upgrade/3.5.2/clean_plugin_helper.sql
new file mode 100644
index 0000000..a6bfe51
--- /dev/null
+++ b/sql/mysql/upgrade/3.5.2/clean_plugin_helper.sql
@@ -0,0 +1 @@
+DELETE * FROM plugin_helper;