diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 023d7bca9..e8b72fff5 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -30,6 +30,7 @@
  - fix: Survey duplication not working
  - fix: "Open link in new window" with WebGUI asset tree link in TinyMCE
  - fix: Admin Users submenu doesn't fill in uid
+ - fix: EMS Manage Events broken
 
 7.1.4
  - Template variables in the main Survey Template were out of date in the
diff --git a/docs/upgrades/templates-7.2.0/ems_checkout.tmpl b/docs/upgrades/templates-7.2.0/ems_checkout.tmpl
new file mode 100644
index 000000000..14570c13b
--- /dev/null
+++ b/docs/upgrades/templates-7.2.0/ems_checkout.tmpl
@@ -0,0 +1,96 @@
+#EventManagerTmpl000003
+<tmpl_if resolveConflicts>
+<tmpl_var form.header>
+<table width="100%" border="0">
+<tr><td><tmpl_var message></td></tr>
+
+<tr>
+	<td>
+		<table width="100%">
+ <tmpl_loop conflict_loop>
+		<tr<tmpl_unless __ODD__> class="evenRow"<tmpl_else> class="oddRow"</tmpl_unless>>
+			<td><tmpl_var form.deleteControl></td>
+			<td><tmpl_var title></td>
+			<td><tmpl_var description></td>
+			<td><tmpl_var price></td>
+		</tr>
+ </tmpl_loop>
+		</table>
+	</td>
+</tr> 
+<tr><td><tmpl_var form.submit></td></tr>
+</table>
+<tmpl_var form.footer>
+</tmpl_if>
+
+
+
+
+<tmpl_if registration>
+  <tmpl_var form.header>
+  <tmpl_var form.message>
+  <tmpl_var form.chooserJS>
+  <table style="border-top:solid gray 1px;width:100%;margin-top:5px;">
+<tmpl_if form.badgeId><tr><td><tmpl_var form.badgeId.label></td><td><tmpl_var form.badgeId></td></tr></tmpl_if>
+  <tr><td><tmpl_var form.firstName.label></td><td><tmpl_var form.firstName></td></tr>
+<tr><td><tmpl_var form.lastName.label></td><td><tmpl_var form.lastName></td></tr>
+<tr><td><tmpl_var form.address.label></td><td><tmpl_var form.address></td></tr>
+<tr><td><tmpl_var form.city.label></td><td><tmpl_var form.city></td></tr>
+<tr><td><tmpl_var form.state.label></td><td><tmpl_var form.state></td></tr>
+<tr><td><tmpl_var form.zipcode.label></td><td><tmpl_var form.zipcode></td></tr>
+<tr><td><tmpl_var form.country.label></td><td><tmpl_var form.country></td></tr>
+<tr><td><tmpl_var form.phoneNumber.label></td><td><tmpl_var form.phoneNumber></td></tr>
+<tr><td><tmpl_var form.email.label></td><td><tmpl_var form.email></td></tr>
+<tr><td colspan="2"><br /><tmpl_var form.submit><a href="<tmpl_var cancelRegistration.url>" style="text-align: right;"><tmpl_var cancelRegistration.url.label></a></td></tr>
+</table>
+<script type="text/javascript">
+
+function swapBadgeInfo(badgeId) {
+	var selector = document.getElementById('badgeId_formId');
+	for (var i in badges[badgeId]) {
+		var field = document.getElementById(i+'_formId');
+		if (field && badges[badgeId][i]) {
+			field.value=badges[badgeId][i];
+		} else {
+			if (field) field.value='';
+		}
+	}
+}	
+
+var selector1 = document.getElementById('badgeId_formId');
+if (selector1) {
+	swapBadgeInfo(selector1.value);
+}
+
+</script>
+<tmpl_var form.footer>
+</tmpl_if>
+
+<tmpl_if prereqsAreMissing>
+<tmpl_var form.header>
+<table border="1">
+
+<tmpl_loop message_loop>
+<tr>
+	<td colspan="4"><strong><tmpl_var title> requires all of the following:</strong></td>
+</tr>
+<tr>
+	<td colspan="4">
+		<ul>
+<tmpl_loop messageLoop>
+			<li><tmpl_var reqmessage></li>
+</tmpl_loop>
+		</ul>
+	</td>
+</tr>
+</tmpl_loop>
+
+<tmpl_loop missingEvents_loop>
+<tr<tmpl_unless __ODD__> class="evenRow"<tmpl_else> class="oddRow"</tmpl_unless>><td><tmpl_var form.checkBox></td><td><tmpl_var title></td><td><tmpl_var description></td><td><tmpl_var price></td></tr>
+</tmpl_loop>
+<tr><td colspan="4"><br /><tmpl_var form.submit></td></tr>
+</table>
+<tmpl_var form.footer>
+
+</tmpl_if>
+
diff --git a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
index f0cfbf6f3..eeb609b1a 100644
--- a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
+++ b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
@@ -930,7 +930,9 @@ sub getRegistrationInfo {
 	$var{'form.updateProfile'} = WebGUI::Form::Checkbox($self->session,{name=>'updateProfile'});
 	$var{isLoggedIn} = 1 if ($self->session->user->userId ne '1');
 	$var{'form.email'} = WebGUI::Form::Email($self->session,{name=>'email'});
-	$var{'registration'} = 1;	
+	$var{'registration'} = 1;
+	$var{'cancelRegistration.url'} = $self->getUrl('func=resetScratchCart');
+	$var{'cancelRegistration.url.label'} = $i18n->get('cancel registration');	
 	return \%var;
 }
 
diff --git a/lib/WebGUI/i18n/English/Asset_EventManagementSystem.pm b/lib/WebGUI/i18n/English/Asset_EventManagementSystem.pm
index 21ae11408..eeaa4b406 100644
--- a/lib/WebGUI/i18n/English/Asset_EventManagementSystem.pm
+++ b/lib/WebGUI/i18n/English/Asset_EventManagementSystem.pm
@@ -1,6 +1,12 @@
 package WebGUI::i18n::English::Asset_EventManagementSystem;
 
 our $I18N = { ##hashref of hashes
+	'cancel registration' => {
+		message => q|Cancel Registration|,
+		lastUpdated => 0,
+		context => q|Label for hyperlink asking user if they wish to cancel the registration process during checkout.|,
+	},
+
         'search template' => { 
 		message => q|Search Template|,
 		lastUpdated => 1131394070,