diff --git a/assets/javascripts/discourse/connectors/topic-list-custom-tags/assign-to.raw.hbs b/assets/javascripts/discourse/connectors/topic-list-custom-tags/assign-to.raw.hbs
deleted file mode 100644
index 4858d25..0000000
--- a/assets/javascripts/discourse/connectors/topic-list-custom-tags/assign-to.raw.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-{{#if context.topic.assigned_to_user}}
-<a class='assigned-to discourse-tag simple' href="{{context.topic.assignedToUserPath}}"><i class='fa fa-user-plus'></i>{{context.topic.assigned_to_user.username}}</a>
-{{/if}}
diff --git a/assets/javascripts/discourse/connectors/topic-list-tags/assigned-to.raw.hbs b/assets/javascripts/discourse/connectors/topic-list-tags/assigned-to.raw.hbs
deleted file mode 100644
index 3bd6cac..0000000
--- a/assets/javascripts/discourse/connectors/topic-list-tags/assigned-to.raw.hbs
+++ /dev/null
@@ -1,8 +0,0 @@
-{{#unless context.topic.tags}}
-
-{{#if context.topic.assigned_to_user}}
-<div class='discourse-tags'>
-  <a class='assigned-to discourse-tag simple' href="{{context.topic.assignedToUserPath}}"><i class='fa fa-user-plus'></i>{{context.topic.assigned_to_user.username}}</a>
-</div>
-{{/if}}
-{{/unless}}
diff --git a/assets/javascripts/discourse/initializers/extend-for-assigns.js.es6 b/assets/javascripts/discourse/initializers/extend-for-assigns.js.es6
index f8cf25a..af40bb4 100644
--- a/assets/javascripts/discourse/initializers/extend-for-assigns.js.es6
+++ b/assets/javascripts/discourse/initializers/extend-for-assigns.js.es6
@@ -1,5 +1,4 @@
 import { withPluginApi } from 'discourse/lib/plugin-api';
-import { h } from 'virtual-dom';
 import { observes } from 'ember-addons/ember-computed-decorators';
 
 
@@ -58,19 +57,13 @@ function initialize(api, container) {
 
   api.addDiscoveryQueryParam('assigned', {replace: true, refreshModel: true});
 
-  api.decorateWidget('header-topic-info:after-tags', dec => {
-
-    const topic = dec.attrs.topic;
+  api.addTagsHtmlCallback((topic) => {
     const assignedTo = topic.get('assigned_to_user.username');
     if (assignedTo) {
       const assignedPath = topic.get('assignedToUserPath');
-      return h('div.list-tags.assigned',
-          h('a.assigned-to.discourse-tag.simple', {href: assignedPath}, [
-            h('i.fa.fa-user-plus'),
-            assignedTo
-          ])
-      );
+      return `<a class='assigned-to discourse-tag simple' href='${assignedPath}'><i class='fa fa-user-plus'></i>${assignedTo}</a>`;
     }
+
   });
 
   api.decorateWidget('post-contents:after-cooked', dec => {
@@ -93,7 +86,7 @@ function initialize(api, container) {
 export default {
   name: 'extend-for-assign',
   initialize(container) {
-    withPluginApi('0.8.1', api => {
+    withPluginApi('0.8.2', api => {
       initialize(api, container);
     });
   }