diff --git a/zephyr/static/js/ui.js b/zephyr/static/js/ui.js
index 7624864126..248cbde1a1 100644
--- a/zephyr/static/js/ui.js
+++ b/zephyr/static/js/ui.js
@@ -1523,14 +1523,14 @@ exports.set_presence_list = function (users, presence_info) {
     $('#user_presences').empty();
 
     function add_entry(name, email, type) {
-        var entry = $('<li>')
-            .append($('<a>').attr({href: '#', 'data-email': email})
-                            .text(name))
-            .addClass('user_' + type)
-            .attr('title', name + presence_descriptions[type]);
+        var args = {name: name,
+                    type: type,
+                    type_desc: presence_descriptions[type],
+                    email: email};
         if (email === this.email) {
-            entry.addClass('my_fullname');
+            args.my_fullname = true;
         }
+        var entry = templates.render('user_presence_row', args);
         $('#user_presences').append(entry);
     }
 
diff --git a/zephyr/static/templates/user_presence_row.handlebars b/zephyr/static/templates/user_presence_row.handlebars
new file mode 100644
index 0000000000..d2f0e98973
--- /dev/null
+++ b/zephyr/static/templates/user_presence_row.handlebars
@@ -0,0 +1,5 @@
+{{! User Presence rows }}
+<li class="user_sidebar_entry user_{{type}}">
+<a href="#" data-email="{{email}}" title="{{name}} {{type_desc}}"
+ class="{{#if my_fullname}} my_fullname{{/if}}">{{name}}</a>
+</li>