diff --git a/client/html/comment.tpl b/client/html/comment.tpl
index 8cae159..c0aa766 100644
--- a/client/html/comment.tpl
+++ b/client/html/comment.tpl
@@ -1,12 +1,12 @@
 <div class='comment'>
     <div class='avatar'>
-        <% if (ctx.comment.user.name && ctx.canViewUsers) { %>
+        <% if (ctx.comment.user && ctx.comment.user.name && ctx.canViewUsers) { %>
             <a href='/user/<%- encodeURIComponent(ctx.comment.user.name) %>'>
         <% } %>
 
-        <%= ctx.makeThumbnail(ctx.comment.user.avatarUrl) %>
+        <%= ctx.makeThumbnail(ctx.comment.user ? ctx.comment.user.avatarUrl : null) %>
 
-        <% if (ctx.comment.user.name && ctx.canViewUsers) { %>
+        <% if (ctx.comment.user && ctx.comment.user.name && ctx.canViewUsers) { %>
             </a>
         <% } %>
     </div>
@@ -14,13 +14,13 @@
     <div class='body'>
         <header><!--
             --><span class='nickname'><!--
-                --><% if (ctx.comment.user.name && ctx.canViewUsers) { %><!--
+                --><% if (ctx.comment.user && ctx.comment.user.name && ctx.canViewUsers) { %><!--
                     --><a href='/user/<%- encodeURIComponent(ctx.comment.user.name) %>'><!--
                 --><% } %><!--
 
-                --><%- ctx.comment.user.name %><!--
+                --><%- ctx.comment.user ? ctx.comment.user.name : 'Deleted user' %><!--
 
-                --><% if (ctx.comment.user.name && ctx.canViewUsers) { %><!--
+                --><% if (ctx.comment.user && ctx.comment.user.name && ctx.canViewUsers) { %><!--
                     --></a><!--
                 --><% } %><!--
             --></span><!--
diff --git a/client/js/util/views.js b/client/js/util/views.js
index 2f1f4d7..41fde35 100644
--- a/client/js/util/views.js
+++ b/client/js/util/views.js
@@ -189,8 +189,9 @@ function makeTagLink(name) {
 }
 
 function makeUserLink(user) {
-    const text = makeThumbnail(user.avatarUrl) + user.name;
-    const link = api.hasPrivilege('users:view') ?
+    let text = makeThumbnail(user ? user.avatarUrl : null);
+    text += user && user.name ? user.name : 'Anonymous';
+    const link = user && api.hasPrivilege('users:view') ?
         makeNonVoidElement(
             'a', {'href': '/user/' + encodeURIComponent(user.name)}, text) :
         text;