diff --git a/assets/javascripts/discourse/templates/modal/post-event-invitees.hbs b/assets/javascripts/discourse/templates/modal/post-event-invitees.hbs
index 1fb55c8a..846ffaf5 100644
--- a/assets/javascripts/discourse/templates/modal/post-event-invitees.hbs
+++ b/assets/javascripts/discourse/templates/modal/post-event-invitees.hbs
@@ -10,12 +10,7 @@
{{#each invitees as |invitee|}}
-
-
- {{avatar invitee.user imageSize="medium"}}
-
- {{format-username invitee.user.username}}
-
-
+ {{render-invitee invitee}}
{{#if invitee.status}}
{{i18n (concat "event.invitee_status." invitee.status)}}
diff --git a/assets/javascripts/helpers/render-invitee.js.es6 b/assets/javascripts/helpers/render-invitee.js.es6
new file mode 100644
index 00000000..6da03956
--- /dev/null
+++ b/assets/javascripts/helpers/render-invitee.js.es6
@@ -0,0 +1,21 @@
+import { renderAvatar } from "discourse/helpers/user-avatar";
+import { userPath } from "discourse/lib/url";
+import { htmlHelper } from "discourse-common/lib/helpers";
+import { htmlSafe } from "@ember/template";
+import { formatUsername } from "discourse/lib/utilities";
+
+export default htmlHelper(invitee => {
+ const path = userPath(invitee.user.username);
+ const template = `
+
+
+ ${renderAvatar(invitee.user, { imageSize: "medium" })}
+
+ ${formatUsername(invitee.user.username)}
+
+
+
+ `;
+
+ return htmlSafe(template);
+});