Index: branches/5.3.x/core/install/upgrades.sql
===================================================================
diff -u -N -r15956 -r15963
--- branches/5.3.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 15956)
+++ branches/5.3.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 15963)
@@ -2982,3 +2982,10 @@
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:module_deployment_log.view', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:module_deployment_log.edit', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:module_deployment_log.delete', 11, 1, 1, 0);
+
+UPDATE EmailTemplates
+SET
+	l<%PRIMARY_LANGUAGE%>_Subject = REPLACE(l<%PRIMARY_LANGUAGE%>_Subject, '<inp2:u_Field name="Email"/>', '<inp2:Field name="Email"/>'),
+	l<%PRIMARY_LANGUAGE%>_PlainTextBody = REPLACE(l<%PRIMARY_LANGUAGE%>_PlainTextBody, '<inp2:u_Field name="Email"/>', '<inp2:Field name="Email"/>'),
+	l<%PRIMARY_LANGUAGE%>_HtmlBody = REPLACE(l<%PRIMARY_LANGUAGE%>_HtmlBody, '<inp2:u_Field name="Email"/>', '<inp2:Field name="Email"/>')
+WHERE TemplateName IN ('USER.SUBSCRIBE', 'USER.UNSUBSCRIBE');
