diff --git a/app/helpers/html-safe.js b/app/helpers/html-safe.js
new file mode 100644
index 00000000000..4cbc50b5c58
--- /dev/null
+++ b/app/helpers/html-safe.js
@@ -0,0 +1,8 @@
+import { helper } from '@ember/component/helper';
+import { htmlSafe as markAsSafe } from '@ember/template';
+
+export function htmlSafe([content] /*, hash*/) {
+  return markAsSafe(content);
+}
+
+export default helper(htmlSafe);
diff --git a/app/templates/components/crate-readme.hbs b/app/templates/components/crate-readme.hbs
index 624ded4c91a..24b77319bfe 100644
--- a/app/templates/components/crate-readme.hbs
+++ b/app/templates/components/crate-readme.hbs
@@ -1 +1 @@
-{{{rendered}}}
+{{html-safe rendered}}
diff --git a/app/templates/crate/owners.hbs b/app/templates/crate/owners.hbs
index bd30b32f252..66246307592 100644
--- a/app/templates/crate/owners.hbs
+++ b/app/templates/crate/owners.hbs
@@ -57,7 +57,11 @@
         {{/link-to}}
       </div>
       <div class='stats'>
-        {{{ if user.email user.email "&nbsp;" }}}
+        {{#if user.email}}
+          {{user.email}}
+        {{else}}
+          &nbsp;
+        {{/if}}
       </div>
       <div class='stats downloads'>
         <button class='remove-owner small yellow-button' {{action 'removeOwner' user}}>Remove</button>