diff --git a/data/templates/affiliations.jats b/data/templates/affiliations.jats
index 2df99d75e..17c3cf164 100644
--- a/data/templates/affiliations.jats
+++ b/data/templates/affiliations.jats
@@ -1,7 +1,7 @@
 $--
 $-- Affiliations
 $--
-<aff id="aff-$affiliation.id$">
+<aff id="aff-$it.id$">
 $-- wrap affiliation if it has a known institution identifier
 $if(it.group)$
 <institution content-type="group">${it.group}</institution>
diff --git a/data/templates/default.jats_articleauthoring b/data/templates/default.jats_articleauthoring
index 29abe86c5..01042b001 100644
--- a/data/templates/default.jats_articleauthoring
+++ b/data/templates/default.jats_articleauthoring
@@ -36,12 +36,12 @@ $elseif(author.name)$
 $else$
 <string-name>$author$</string-name>
 $endif$
-$if(author.email)$
-<email>$author.email$</email>
-$endif$
 $for(author.affiliation)$
 ${ it:affiliations.jats() }
 $endfor$
+$if(author.email)$
+<email>$author.email$</email>
+$endif$
 $if(author.cor-id)$
 <xref ref-type="corresp" rid="cor-$author.cor-id$"><sup>*</sup></xref>
 $endif$