diff --git a/web/templates/forum/board_index.html b/web/templates/forum/board_index.html
index e6313e9..2ae3c82 100644
--- a/web/templates/forum/board_index.html
+++ b/web/templates/forum/board_index.html
@@ -68,7 +68,7 @@
                         {{template "avatar-64x64" .Comment.User}}
                     </a>
                 </div>
-                <a href="/u/{{.Comment.User.Username}}">{{.Comment.User.Username}}</a>
+                <a href="/u/{{.Comment.User.Username}}">{{.Comment.User.NameOrUsername}}</a>
             </div>
             <div class="column content pt-1 pb-0">
                 <a href="/forum/thread/{{.ID}}">
diff --git a/web/templates/forum/thread.html b/web/templates/forum/thread.html
index 6c2a34e..b1564b5 100644
--- a/web/templates/forum/thread.html
+++ b/web/templates/forum/thread.html
@@ -111,7 +111,7 @@
                         {{template "avatar-96x96" $c.User}}
                     </a>
                 </div>
-                <a href="/u/{{$c.User.Username}}">{{$c.User.Username}}</a>
+                <a href="/u/{{$c.User.Username}}">{{$c.User.NameOrUsername}}</a>
                 {{if $c.User.IsAdmin}}
                 <div class="is-size-7 mt-1">
                     <span class="tag is-danger is-light">
diff --git a/web/templates/photo/permalink.html b/web/templates/photo/permalink.html
index ceb5a3b..77d70de 100644
--- a/web/templates/photo/permalink.html
+++ b/web/templates/photo/permalink.html
@@ -217,7 +217,7 @@
                                             {{template "avatar-96x96" .User}}
                                         </a>
                                     </div>
-                                    <a href="/u/{{.User.Username}}">{{.User.Username}}</a>
+                                    <a href="/u/{{.User.Username}}">{{.User.NameOrUsername}}</a>
                                 </div>
 
                                 <div class="column content">