diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Packages/PackageController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Packages/PackageController.cs
index b8532151..522ab4e6 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Packages/PackageController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Packages/PackageController.cs
@@ -619,7 +619,7 @@ namespace WebsitePanel.EnterpriseServer
 
                 BackgroundTask topTask = TaskManager.TopTask;
 
-                topTask.ItemId = userId;
+                topTask.ItemId = result.Result;
                 topTask.UpdateParamValue("SendLetter", sendLetter);
 
                 TaskController.UpdateTaskWithParams(topTask);
@@ -724,7 +724,7 @@ namespace WebsitePanel.EnterpriseServer
 
                 BackgroundTask topTask = TaskManager.TopTask;
 
-                topTask.ItemId = userId;
+                topTask.ItemId = result.Result;
                 topTask.UpdateParamValue("Signup", signup);
                 topTask.UpdateParamValue("UserId", userId);
                 topTask.UpdateParamValue("SendLetter", sendLetter);
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/SystemEventHandlers.config b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/SystemEventHandlers.config
index 156bd913..50c56886 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/SystemEventHandlers.config
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/SystemEventHandlers.config
@@ -1,36 +1,36 @@
 <?xml version="1.0"?>
 <eventHandlers>
 	<task source="USER" name="ADD">
-		<handler type="WebsitePanel.EnterpriseServer.Tasks.SendEmailNotification, WebsitePanel.EnterpriseServer" />
+		<handler type="WebsitePanel.EnterpriseServer.Tasks.SendEmailNotification, WebsitePanel.EnterpriseServer.Code" />
 	</task>
 	<task source="HOSTING_SPACE" name="ADD">
-		<handler type="WebsitePanel.EnterpriseServer.Tasks.SendEmailNotification, WebsitePanel.EnterpriseServer" />
+		<handler type="WebsitePanel.EnterpriseServer.Tasks.SendEmailNotification, WebsitePanel.EnterpriseServer.Code" />
 	</task>
 	<task source="HOSTING_SPACE_WR" name="ADD">
-		<handler type="WebsitePanel.EnterpriseServer.Tasks.SendEmailNotification, WebsitePanel.EnterpriseServer" />
+		<handler type="WebsitePanel.EnterpriseServer.Tasks.SendEmailNotification, WebsitePanel.EnterpriseServer.Code" />
 	</task>
 	<task source="ECOMMERCE" name="ADD_INVOICE">
-		<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SendEmailNotification, WebsitePanel.EnterpriseServer" />
-		<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SystemTriggersAgent, WebsitePanel.EnterpriseServer" />
+		<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SendEmailNotification, WebsitePanel.EnterpriseServer.Code" />
+		<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SystemTriggersAgent, WebsitePanel.EnterpriseServer.Code" />
 	</task>
 	<task source="ECOMMERCE" name="ADD_CONTRACT">
-		<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SystemTriggersAgent, WebsitePanel.EnterpriseServer" />
+		<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SystemTriggersAgent, WebsitePanel.EnterpriseServer.Code" />
 	</task>
 	<task source="ECOMMERCE" name="ADD_PAYMENT">
-		<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SendEmailNotification, WebsitePanel.EnterpriseServer" />
-		<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SystemTriggersAgent, WebsitePanel.EnterpriseServer" />
+		<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SendEmailNotification, WebsitePanel.EnterpriseServer.Code" />
+		<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SystemTriggersAgent, WebsitePanel.EnterpriseServer.Code" />
 	</task>
 	<task source="ECOMMERCE" name="UPDATE_PAYMENT">
-		<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SendEmailNotification, WebsitePanel.EnterpriseServer" />
-		<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SystemTriggersAgent, WebsitePanel.EnterpriseServer" />
+		<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SendEmailNotification, WebsitePanel.EnterpriseServer.Code" />
+		<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SystemTriggersAgent, WebsitePanel.EnterpriseServer.Code" />
 	</task>
 	<task source="ECOMMERCE" name="SVC_ACTIVATE">
-		<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SendEmailNotification, WebsitePanel.EnterpriseServer" />
+		<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SendEmailNotification, WebsitePanel.EnterpriseServer.Code" />
 	</task>
 	<task source="ECOMMERCE" name="SVC_SUSPEND">
-		<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SendEmailNotification, WebsitePanel.EnterpriseServer" />
+		<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SendEmailNotification, WebsitePanel.EnterpriseServer.Code" />
 	</task>
 	<task source="ECOMMERCE" name="SVC_CANCEL">
-		<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SendEmailNotification, WebsitePanel.EnterpriseServer" />
+		<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SendEmailNotification, WebsitePanel.EnterpriseServer.Code" />
 	</task>
 </eventHandlers>