diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_checkout.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_checkout.tmpl
index 1dbae6fe7..092b3b48a 100644
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_checkout.tmpl
+++ b/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_checkout.tmpl
@@ -62,7 +62,12 @@ function swapBadgeInfo(badgeId) {
 		}
 	}
 }	
-	
+
+var selector1 = document.getElementById('badgeId_formId');
+if (selector1) {
+	swapBadgeInfo(selector1.value);
+}
+
 </script>
 <tmpl_var form.footer>
 </tmpl_if>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_view_purchase.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_view_purchase.tmpl
index 767bcd324..f3e054c21 100644
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_view_purchase.tmpl
+++ b/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_view_purchase.tmpl
@@ -9,13 +9,16 @@
 </tmpl_if>
 <h1><tmpl_var viewPurchaseTitle></h1>
 <tmpl_if canReturn><a href="<tmpl_var returnPurchaseUrl>"><tmpl_var returnPurchaseLabel></a></tmpl_if>
-
+<tmpl_loop purchasesLoop>
 <table width="100%">
 <tr><td><tmpl_var badgeNameLabel></td><td><tmpl_var eventTitle.label></td><td><tmpl_var eventDates.label></td><tmpl_if canReturn><td><tmpl_var returnButton.label></td></tmpl_if></tr></tr><td>
-<tmpl_var registration.firstName> <tmpl_var registrationLastName>
-</td>
-<tmpl_loop registrationLoop>
-<tr><td><tmpl_var registration.title></td><td><tmpl_var registration.startDateHuman> - <tmpl_var registration.endDateHuman></td><tmpl_if canReturn><td><a href="<tmpl_var registration.returnUrl>"><tmpl_var registration.returnLabel></a></td></tmpl_if></tr>
+<tmpl_var badge.firstName> <tmpl_var badge.lastName>
+</td><td>
+<tmpl_loop regLoop>
+<table width="100%">
+<tr><td>a<tmpl_var registration.title></td><td><tmpl_var registration.startDateHuman> - <tmpl_var registration.endDateHuman></td><tmpl_if canReturn><td><a href="<tmpl_var registration.returnUrl>"><tmpl_var registration.returnLabel></a></td></tmpl_if></tr>
 </tmpl_loop>
+</table></td></tr>
 <tmpl_if registration.canAddEvents><tr colspan="<tmpl_if canReturn>3<tmpl_else>2</tmpl_if>"><td><a href="<tmpl_var registration.addEventsUrl>"><tmpl_var addEventsLabel></a></td></tr></tmpl_if>
-</table>
\ No newline at end of file
+</table>
+</tmpl_loop>
\ No newline at end of file