2 files changed, 4 insertions, 3 deletions
diff --git a/template/default/prefs/account.tmpl b/template/default/prefs/account.tmpl
index e436d07a5..2033e86fc 100644
--- a/template/default/prefs/account.tmpl
+++ b/template/default/prefs/account.tmpl
@@ -69,7 +69,7 @@
       [% IF new_login_name %]
         <tr>
           <th align="right">Pending email address:</th>
-          <td>[% new_login_name %]</td>
+          <td>[% new_login_name FILTER html %]</td>
         </tr>
         <tr>
           <th align="right">Change request expires:</th>
diff --git a/template/default/prefs/userprefs.tmpl b/template/default/prefs/userprefs.tmpl
index 8992794b1..5d9fc6eb3 100644
--- a/template/default/prefs/userprefs.tmpl
+++ b/template/default/prefs/userprefs.tmpl
@@ -34,10 +34,11 @@
   #                displaying anything, and can contain an optional custom
   #                message if required (which Perl still evaluates as True).
   #%]
- 
+
+[% filtered_login = login FILTER html %]
 [% INCLUDE global/header
    title = "User Preferences"
-   h2 = login
+   h2 = filtered_login
    style = "td.selected_tab {
               border-width: 2px 2px 0px;
               border-style: solid;