diff --git a/fas/fas/templates/user/edit.html b/fas/fas/templates/user/edit.html
index af32575..be5b861 100644
--- a/fas/fas/templates/user/edit.html
+++ b/fas/fas/templates/user/edit.html
@@ -18,6 +18,7 @@
       <div class="field">
         <label for="mail">${_('Email')}:</label>
         <input type="text" id="email" name="email" value="${target.email}" />
+        <span py:if="target.unverified_email and target.emailtoken">${_('(pending change to %s)') % target.unverified_email}</span>
         <script type="text/javascript">var hb2 = new HelpBalloon({dataURL: '${tg.url('/help/get_help/user_email')}'});</script>
       </div>
 <!--      <div class="field">
diff --git a/fas/fas/templates/user/view.html b/fas/fas/templates/user/view.html
index 0c29c87..e1347ab 100644
--- a/fas/fas/templates/user/view.html
+++ b/fas/fas/templates/user/view.html
@@ -19,7 +19,7 @@
       <dl>
         <dt>${_('Account Name:')}</dt><dd>${person.username}</dd>
         <dt>${_('Real Name:')}</dt><dd>${person.human_name}</dd>
-        <dt>${_('Email:')}</dt><dd>${person.email}</dd>
+        <dt>${_('Email:')}</dt><dd>${person.email} <span py:if="(personal or admin) and person.unverified_email and person.emailtoken">${_('(pending change to %s)') % person.unverified_email}</span></dd>
         <!--<dt>${_('Bugzilla Email:')}</dt><dd>${person.username}</dd>-->
         <dt>${_('IRC Nick:')}</dt><dd>${person.ircnick}&nbsp;</dd>
         <dt>${_('PGP Key:')}</dt><dd>${person.gpg_keyid}&nbsp;</dd>