diff --git a/Changelog.md b/Changelog.md
index 7ad2a98c6..dca5581db 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -10,6 +10,7 @@
 * Fix path to `bundle` in `script/server` [#7281](https://github.com/diaspora/diaspora/pull/7281)
 * Update comment in database example config [#7282](https://github.com/diaspora/diaspora/pull/7282)
 * Make the \#newhere post public again [#7311](https://github.com/diaspora/diaspora/pull/7311)
+* Remove whitespace from author link [#7330](https://github.com/diaspora/diaspora/pull/7330)
 
 ## Features
 * Add support for [Liberapay](https://liberapay.com) donations [#7290](https://github.com/diaspora/diaspora/pull/7290)
diff --git a/app/assets/templates/stream-element_tpl.jst.hbs b/app/assets/templates/stream-element_tpl.jst.hbs
index 2c65c427a..6347b73fc 100644
--- a/app/assets/templates/stream-element_tpl.jst.hbs
+++ b/app/assets/templates/stream-element_tpl.jst.hbs
@@ -12,7 +12,7 @@
 
     <div>
       {{#linkToAuthor author}}
-        {{name}}
+        {{~name~}}
       {{/linkToAuthor}}
 
       <span class="details gray">