diff --git a/zephyr/static/js/ui.js b/zephyr/static/js/ui.js
index a3168b8ddb..fc903baa0b 100644
--- a/zephyr/static/js/ui.js
+++ b/zephyr/static/js/ui.js
@@ -1236,7 +1236,7 @@ $(function () {
         user_sidebar_popup_shown_this_click = true;
 
         var email = $(e.target).find('a').attr('data-email');
-        var name = $(e.target).find('a').text();
+        var name = $(e.target).find('a').attr('data-name');
 
         $(e.target).popover({
             content:   templates.render('user_sidebar_actions', {'email': email,
diff --git a/zephyr/static/templates/user_presence_row.handlebars b/zephyr/static/templates/user_presence_row.handlebars
index b42aab1c02..d4a5e28a13 100644
--- a/zephyr/static/templates/user_presence_row.handlebars
+++ b/zephyr/static/templates/user_presence_row.handlebars
@@ -1,5 +1,5 @@
 {{! User Presence rows }}
 <li class="user_sidebar_entry user_{{type}}">
-<a href="#" data-email="{{email}}" title="{{name}} {{type_desc}}"
+<a href="#" data-email="{{email}}" data-name="{{name}}" title="{{name}} {{type_desc}}"
  class="{{#if my_fullname}} my_fullname{{/if}}"><span class="count">(<span class="value"></span>) </span>{{name}}</a>
 </li>