diff --git a/zephyr/static/js/settings.js b/zephyr/static/js/settings.js
index cc917c8235..a0c11815a5 100644
--- a/zephyr/static/js/settings.js
+++ b/zephyr/static/js/settings.js
@@ -3,16 +3,14 @@ var settings = (function () {
 var exports = {};
 
 function add_bot_row(name, email, avatar_url, api_key) {
-    var avatar_cell;
+    var info = {
+        name: name,
+        email: email,
+        avatar_url: avatar_url,
+        api_key: api_key
+    };
 
-    avatar_cell = $('<img>').attr('src', avatar_url).attr('class', 'avatar');
-
-    var row = $('<li>').append(
-            $('<span>').html(avatar_cell),
-            $('<span>').text(name),
-            $('<span>').text(email),
-            $('<span class="api_key">').text(api_key)
-    );
+    var row = $(templates.render('bot_avatar_row', info));
     $('#bots_list').append(row);
     $('#bots_list').show();
 }
diff --git a/zephyr/static/templates/bot_avatar_row.handlebars b/zephyr/static/templates/bot_avatar_row.handlebars
new file mode 100644
index 0000000000..5fbb24b6a0
--- /dev/null
+++ b/zephyr/static/templates/bot_avatar_row.handlebars
@@ -0,0 +1,6 @@
+<li>
+	<span><img src="{{avatar_url}}" class=avatar></span>
+	<span>{{name}}</span>
+	<span>{{email}}</span>
+	<span class="api_key">{{api_key}}</span>
+</li>
\ No newline at end of file