diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index d4c20deda9d..a92c2be1a92 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-8794
\ No newline at end of file
+8795
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/template/en/default/email/bugmail.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/email/bugmail.html.tmpl
index 5d31d27a0e6..6464e0a96bb 100644
--- a/mozilla/webtools/bugzilla/template/en/default/email/bugmail.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/email/bugmail.html.tmpl
@@ -23,7 +23,7 @@
             <b>[% "Comment # ${comment.count}" FILTER bug_link(bug,
               {comment_num => comment.count, full_url => 1, user => to_user}) FILTER none %]
               on [% "$terms.bug $bug.id" FILTER bug_link(bug, { full_url => 1, user => to_user }) FILTER none %]
-              from [% INCLUDE global/user.html.tmpl who = comment.author %]</b>
+              from [% INCLUDE global/user.html.tmpl user = to_user, who = comment.author %]</b>
           [% END %]
         <pre>[% comment.body_full({ wrap => 1 }) FILTER quoteUrls(bug, comment, to_user) %]</pre>
         </div>
@@ -64,7 +64,7 @@
                   FILTER bug_link(change.blocker, {full_url => 1, user => to_user}) FILTER none %],
               which changed state.
         [% ELSE %]
-              [% INCLUDE global/user.html.tmpl who = change.who %] changed
+              [% INCLUDE global/user.html.tmpl user = to_user, who = change.who %] changed
               [%+ "${terms.bug} ${bug.id}" FILTER bug_link(bug, {full_url => 1, user => to_user}) FILTER none %]
         [% END %]
           <br>