Index: branches/5.3.x/core/admin_templates/system_event_subscriptions/system_event_subscription_edit.tpl
===================================================================
diff -u -N -r15483 -r15677
--- branches/5.3.x/core/admin_templates/system_event_subscriptions/system_event_subscription_edit.tpl	(.../system_event_subscription_edit.tpl)	(revision 15483)
+++ branches/5.3.x/core/admin_templates/system_event_subscriptions/system_event_subscription_edit.tpl	(.../system_event_subscription_edit.tpl)	(revision 15677)
@@ -61,8 +61,8 @@
 <div id="scroll_container">
 	<table class="edit-form">
 		<inp2:m_RenderElement name="inp_id_label" prefix="system-event-subscription" field="SubscriptionId" title="la_fld_Id"/>
-		<inp2:m_RenderElement name="inp_edit_options" prefix="system-event-subscription" field="EmailEventId" title="la_fld_SystemEvent" has_empty="1"/>
-		<inp2:m_RenderElement name="inp_label" prefix="system-event-subscription" field="EmailEventName" title="la_fld_EmailEvent"/>
+		<inp2:m_RenderElement name="inp_edit_options" prefix="system-event-subscription" field="EmailTemplateId" title="la_fld_SystemEvent" has_empty="1"/>
+		<inp2:m_RenderElement name="inp_label" prefix="system-event-subscription" field="EmailTemplateName"/>
 		<inp2:m_RenderElement name="inp_edit_box" prefix="system-event-subscription" field="SubscriberEmail" title="la_fld_Email"/>
 		<inp2:m_RenderElement name="inp_edit_user" prefix="system-event-subscription" field="UserId" title="la_fld_Username"/>
 		<inp2:m_RenderElement name="inp_edit_category" prefix="system-event-subscription" field="CategoryId" title="la_fld_Category"/>