diff --git a/template/comment.twig b/template/comment.twig
index 580f0bb..4914c26 100644
--- a/template/comment.twig
+++ b/template/comment.twig
@@ -8,7 +8,7 @@
             <div class="info">
                 {# Username #}
                 <span class="username {{ post.userId == comment.userId ? 'op' }}">
-                    <a href="{{ ('user/' ~ comment.username)|docroot }}">{{ comment.username }}</a>
+                    <a href="{{ ('user/' ~ comment.username|url_encode)|docroot }}">{{ comment.username }}</a>
                 </span>
                 
                 {%
diff --git a/template/edit_comment.twig b/template/edit_comment.twig
index ba61dfb..51edb45 100644
--- a/template/edit_comment.twig
+++ b/template/edit_comment.twig
@@ -6,7 +6,7 @@
     </h3>
 
     <div class="info">
-        by {{ item.data.username }}
+        by <a href="{{ ('user/' ~ item.data.username|url_encode)|docroot }}">{{ item.data.username }}</a>
         <em>{{ item.data.created|ago }}</em>
     </div>
 
diff --git a/template/edit_post.twig b/template/edit_post.twig
index 279d5da..8ff85a2 100644
--- a/template/edit_post.twig
+++ b/template/edit_post.twig
@@ -9,7 +9,7 @@
             <input type="text" name="title" class="form-control" value="{{ item.data.title }}" />
         </div>
         <div class="info">
-            by {{ item.data.username }}
+            by <a href="{{ ('user/' ~ item.data.username|url_encode)|docroot }}">{{ item.data.username }}</a>
             <em>{{ item.data.created|ago }}</em>
         </div>
 
diff --git a/template/index.twig b/template/index.twig
index 4c6694d..8bcdb59 100644
--- a/template/index.twig
+++ b/template/index.twig
@@ -54,7 +54,7 @@ _\(/_  .:.*_\/_*   : /\ :
                 %}
                 
                 <em><a href="post/{{ post.hashId }}">{{ post.created|ago }}</a></em>
-                by <a href="{{ ('user/' ~ post.username)|docroot }}">{{ post.username }}</a>
+                by <a href="{{ ('user/' ~ post.username|url_encode)|docroot }}">{{ post.username }}</a>
                 —
                 <a href="post/{{ post.hashId }}#comments">{{ post.commentsCount ? post.commentsCount }} comments</a>
             </div>
diff --git a/template/post.twig b/template/post.twig
index 6376ca2..cad9509 100644
--- a/template/post.twig
+++ b/template/post.twig
@@ -23,7 +23,7 @@
         } only
         %}
         
-        by <a href="{{ ('user/' ~ post.username)|docroot }}">{{ post.username }}</a> <em>{{ post.created|ago }}</em>
+        by <a href="{{ ('user/' ~ post.username|url_encode)|docroot }}">{{ post.username }}</a> <em>{{ post.created|ago }}</em>
         — {{ post.vote }} votes, <a href="#comments">{{ post.commentsCount }} comments</a>
         
         {% if user and post.userId == user.id %}
diff --git a/template/reply.twig b/template/reply.twig
index 7ff0e0e..5cd3bcf 100644
--- a/template/reply.twig
+++ b/template/reply.twig
@@ -1,7 +1,7 @@
 {% include 'header.twig' %}
 
 <div class="reply">
-    <h3>Reply to <em>{{ comment.username }}</em></h3>
+    <h3>Reply to <em><a href="{{ ('user/' ~ comment.username|url_encode)|docroot }}">{{ comment.username }}</a></em></h3>
     
     <div class="info">
     posted <em><a href="{{ 'post/'|docroot ~ comment.postHashId }}#comment-{{ comment.hashId }}">{{ comment.created|ago }}</a></em>
diff --git a/template/search.twig b/template/search.twig
index 38184cd..99ac99c 100644
--- a/template/search.twig
+++ b/template/search.twig
@@ -19,7 +19,7 @@
             
             <div class="info">
                 <em><a href="post/{{ post.hashId }}">{{ post.created|ago }}</a></em>
-                by <a href="{{ ('user/' ~ post.username)|docroot }}">{{ post.username }}</a>
+                by <a href="{{ ('user/' ~ post.username|url_encode)|docroot }}">{{ post.username }}</a>
                 —
                 <a href="post/{{ post.hashId }}#comments">{{ post.commentsCount ? post.commentsCount }} comments</a>
             </div>
diff --git a/template/user_replies.twig b/template/user_replies.twig
index 43269ee..71a252a 100644
--- a/template/user_replies.twig
+++ b/template/user_replies.twig
@@ -12,7 +12,7 @@
                 <a href="../post/{{ comment.postHashId }}#comment-{{ comment.hashId }}">read</a>
                 <a href="../reply?comment={{ comment.hashId }}">reply</a>
                 —
-                by <a href="../user/{{ comment.username }}">{{ comment.username }}</a> <em>{{ comment.created|ago }}</em> on <a href="../post/{{ comment.postHashId }}">{{ comment.postTitle }}</a>
+                by <a href="../user/{{ comment.username|url_encode }}">{{ comment.username }}</a> <em>{{ comment.created|ago }}</em> on <a href="../post/{{ comment.postHashId }}">{{ comment.postTitle }}</a>
             </div>
         </div>