diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 78bde1a91..640064f12 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -15,6 +15,7 @@
  - fixed #11037: Maintenance page is being cached
  - fixed #11056: No history in wiki 
  - added RFE #10940: Force the user to pick a shipping method before checking out.
+ - fixed #10988: EMS Schedule -- Data Error
 
 7.8.0
  - upgraded YUI to 2.8.0r4
diff --git a/docs/gotcha.txt b/docs/gotcha.txt
index 90487d3fd..2c57edda0 100644
--- a/docs/gotcha.txt
+++ b/docs/gotcha.txt
@@ -7,6 +7,15 @@ upgrading from one version to the next, or even between multiple
 versions. Be sure to heed the warnings contained herein as they will
 save you many hours of grief.
 
+7.8.1
+--------------------------------------------------------------------
+
+    * The EventManagementSystem schedule template as accidently given
+    the same namespace as the main EMS template.  This allowed the
+    wrong template to be chosen for the main EMS template and the
+    schedule template.  The upgrade from 7.8.0 to 7.8.1 will attempt
+    to fix this when default templates have been used.
+
 7.8.0
 --------------------------------------------------------------------
 
diff --git a/docs/upgrades/packages-7.8.1/root_import_ems_ems-schedule-listing-default2.wgpkg b/docs/upgrades/packages-7.8.1/root_import_ems_ems-schedule-listing-default2.wgpkg
new file mode 100644
index 000000000..7296a4502
Binary files /dev/null and b/docs/upgrades/packages-7.8.1/root_import_ems_ems-schedule-listing-default2.wgpkg differ
diff --git a/docs/upgrades/upgrade_7.8.0-7.8.1.pl b/docs/upgrades/upgrade_7.8.0-7.8.1.pl
index c18bcd7d0..3e6921553 100644
--- a/docs/upgrades/upgrade_7.8.0-7.8.1.pl
+++ b/docs/upgrades/upgrade_7.8.0-7.8.1.pl
@@ -31,6 +31,7 @@ my $quiet; # this line required
 my $session = start(); # this line required
 
 fixWikis( $session );
+fixEMSTemplates( $session );
 
 finish($session); # this line required
 
@@ -53,6 +54,15 @@ sub fixWikis {
     print "Done.\n" unless $quiet;
 }
 
+# Describe what our function does
+sub fixEMSTemplates {
+    my $session = shift;
+    print "\tFixing bad usage of Event Management System templates... " unless $quiet;
+    $session->db->write(q|update EventManagementSystem set templateId='2rC4ErZ3c77OJzJm7O5s3w'         where templateId='S2_LsvVa95OSqc66ITAoig'|);
+    $session->db->write(q|update EventManagementSystem set scheduleTemplateId='S2_LsvVa95OSqc66ITAoig' where scheduleTemplateId='2rC4ErZ3c77OJzJm7O5s3w'|);
+    print "Done.\n" unless $quiet;
+}
+
 
 # -------------- DO NOT EDIT BELOW THIS LINE --------------------------------
 
diff --git a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
index 8f1d9f56a..ae04b1d45 100644
--- a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
+++ b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
@@ -66,7 +66,7 @@ sub definition {
 			tab			=> 'display',
 			label			=> $i18n->get('schedule template'),
 			hoverHelp		=> $i18n->get('schedule template help'),
-			namespace		=> 'EMS',
+			namespace		=> 'EMS/Schedule',
 		},
 		scheduleColumnsPerPage => {
 			fieldType 		=> 'Integer',