Index: branches/5.3.x/core/install/install_schema.sql
===================================================================
diff -u -N -r15584 -r15677
--- branches/5.3.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 15584)
+++ branches/5.3.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 15677)
@@ -83,9 +83,9 @@
   KEY MailingId (MailingId)
 );
 
-CREATE TABLE EmailEvents (
-  EventId int(11) NOT NULL AUTO_INCREMENT,
-  `Event` varchar(40) NOT NULL DEFAULT '',
+CREATE TABLE EmailTemplates (
+  TemplateId int(11) NOT NULL AUTO_INCREMENT,
+  TemplateName varchar(40) NOT NULL DEFAULT '',
   ReplacementTags text,
   AllowChangingSender tinyint(4) NOT NULL DEFAULT '0',
   CustomSender tinyint(4) NOT NULL DEFAULT '0',
@@ -123,10 +123,10 @@
   `Type` int(11) NOT NULL DEFAULT '0',
   LastChanged int(10) unsigned DEFAULT NULL,
   BindToSystemEvent varchar(255) NOT NULL DEFAULT '',
-  PRIMARY KEY (EventId),
+  PRIMARY KEY (TemplateId),
   KEY `Type` (`Type`),
   KEY Enabled (Enabled),
-  KEY `Event` (`Event`),
+  KEY `Event` (TemplateName),
   KEY FrontEndOnly (FrontEndOnly),
   KEY AllowChangingSender (AllowChangingSender),
   KEY CustomSender (CustomSender),
@@ -148,7 +148,7 @@
 
 CREATE TABLE SystemEventSubscriptions (
   SubscriptionId int(11) NOT NULL AUTO_INCREMENT,
-  EmailEventId int(11) DEFAULT NULL,
+  EmailTemplateId int(11) DEFAULT NULL,
   SubscriberEmail varchar(255) NOT NULL DEFAULT '',
   UserId int(11) DEFAULT NULL,
   CategoryId int(11) DEFAULT NULL,
@@ -157,7 +157,7 @@
   ParentItemId int(11) DEFAULT NULL,
   SubscribedOn int(11) DEFAULT NULL,
   PRIMARY KEY (SubscriptionId),
-  KEY EmailEventId (EmailEventId)
+  KEY EmailEventId (EmailTemplateId)
 );
 
 CREATE TABLE IdGenerator (
@@ -294,6 +294,7 @@
   PortalUserId int(11) NOT NULL AUTO_INCREMENT,
   Username varchar(255) NOT NULL DEFAULT '',
   `Password` varchar(255) DEFAULT 'd41d8cd98f00b204e9800998ecf8427e',
+  PasswordHashingMethod tinyint(4) NOT NULL DEFAULT '3',
   FirstName varchar(255) NOT NULL DEFAULT '',
   LastName varchar(255) NOT NULL DEFAULT '',
   Company varchar(255) NOT NULL DEFAULT '',
@@ -426,7 +427,7 @@
   HtmlBody longtext,
   TextBody longtext,
   SentOn int(11) DEFAULT NULL,
-  EventName varchar(255) NOT NULL DEFAULT '',
+  TemplateName varchar(255) NOT NULL DEFAULT '',
   EventType tinyint(4) DEFAULT NULL,
   EventParams text,
   AccessKey varchar(32) NOT NULL DEFAULT '',
@@ -1119,13 +1120,13 @@
   MessageText longtext,
   MessageHtml longtext,
   `Status` tinyint(3) unsigned NOT NULL DEFAULT '1',
-  EmailsQueued int(10) unsigned NOT NULL DEFAULT '0',
+  EmailsQueuedTotal int(10) unsigned NOT NULL DEFAULT '0',
   EmailsSent int(10) unsigned NOT NULL DEFAULT '0',
   EmailsTotal int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (MailingId),
   KEY EmailsTotal (EmailsTotal),
   KEY EmailsSent (EmailsSent),
-  KEY EmailsQueued (EmailsQueued),
+  KEY EmailsQueued (EmailsQueuedTotal),
   KEY `Status` (`Status`),
   KEY PortalUserId (PortalUserId)
 );