Index: branches/5.1.x/core/install/install_schema.sql
===================================================================
diff -u -N -r13168 -r13188
--- branches/5.1.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 13168)
+++ branches/5.1.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 13188)
@@ -43,32 +43,27 @@
   KEY DefaultValue (DefaultValue)
 );
 
-CREATE TABLE ConfigurationAdmin (
-  VariableName varchar(80) NOT NULL default '',
-  heading varchar(255) default NULL,
-  prompt varchar(255) default NULL,
-  element_type varchar(20) NOT NULL default '',
+CREATE TABLE ConfigurationValues (
+  VariableId int(11) NOT NULL AUTO_INCREMENT,
+  VariableName varchar(255) NOT NULL DEFAULT '',
+  VariableValue text,
+  ModuleOwner varchar(20) DEFAULT 'In-Portal',
+  Section varchar(255) NOT NULL DEFAULT '',
+  Heading varchar(255) NOT NULL DEFAULT '',
+  Prompt varchar(255) NOT NULL DEFAULT '',
+  ElementType varchar(255) NOT NULL DEFAULT '',
   Validation text,
   ValueList text,
-  DisplayOrder double NOT NULL default '0',
-  GroupDisplayOrder double NOT NULL default '0',
-  Install int(11) NOT NULL default '1',
-  PRIMARY KEY  (VariableName),
+  DisplayOrder double NOT NULL DEFAULT '0',
+  GroupDisplayOrder double NOT NULL DEFAULT '0',
+  `Install` int(11) NOT NULL DEFAULT '1',
+  PRIMARY KEY (VariableId),
+  UNIQUE KEY VariableName (VariableName),
   KEY DisplayOrder (DisplayOrder),
   KEY GroupDisplayOrder (GroupDisplayOrder),
-  KEY Install (Install)
+  KEY `Install` (`Install`)
 );
 
-CREATE TABLE ConfigurationValues (
-  VariableId int(11) NOT NULL auto_increment,
-  VariableName varchar(255) NOT NULL default '',
-  VariableValue text,
-  ModuleOwner varchar(20) default 'In-Portal',
-  Section varchar(255) NOT NULL default '',
-  PRIMARY KEY  (VariableId),
-  UNIQUE KEY VariableName (VariableName)
-);
-
 CREATE TABLE EmailQueue (
   EmailQueueId int(10) unsigned NOT NULL AUTO_INCREMENT,
   ToEmail varchar(255) NOT NULL DEFAULT '',