diff --git a/doc/plugins/googlecalendar.mdwn b/doc/plugins/googlecalendar.mdwn
index 59a4e6ea3..020e5382e 100644
--- a/doc/plugins/googlecalendar.mdwn
+++ b/doc/plugins/googlecalendar.mdwn
@@ -1,4 +1,4 @@
-[[template id=plugin name=linkmap included=1 author="Joey Hess"]]
+[[template id=plugin name=linkmap included=1 author="[[Joey]]"]]
 [[tag type/special-purpose]]
 
 This plugin allows embedding a google calendar iframe in the wiki.
diff --git a/templates/notifymail.tmpl b/templates/notifymail.tmpl
index 978b8a2a3..e3a1dd330 100644
--- a/templates/notifymail.tmpl
+++ b/templates/notifymail.tmpl
@@ -1,4 +1,4 @@
-The following change was made to <TMPL_VAR WIKINAME> by <TMPL_VAR USER>:
+The following change was made by <TMPL_VAR USER>:
 
 <TMPL_VAR MESSAGE>
 <TMPL_VAR DIFF>