diff --git a/pagure/templates/issue.html b/pagure/templates/issue.html
index 6c4d6a3..784bae6 100644
--- a/pagure/templates/issue.html
+++ b/pagure/templates/issue.html
@@ -573,7 +573,7 @@ source.addEventListener('message', function(e) {
             issueid='-123456789')}}';
   process_event(data, "{{ issue.uid }}", _issue_url,
                 _issues_url, _api_issues_url,
-                "{{ g.fas_user.username }}");
+                "{{ g.fas_user.username if authenticated or '' }}");
   setup_edit_btns();
   setup_reply_btns();
 
diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html
index 86b622c..739ab54 100644
--- a/pagure/templates/pull_request.html
+++ b/pagure/templates/pull_request.html
@@ -1345,7 +1345,10 @@ window.onbeforeunload = function() {
 source.addEventListener('message', function(e) {
   console.log(e.data);
   var data = $.parseJSON(e.data);
-  process_event(data, "{{ request.uid }}", "{{ g.fas_user.username }}");
+  process_event(
+    data,
+    "{{ request.uid }}",
+    "{{ g.fas_user.username if authenticated or '' }}");
   setup_edit_btns();
   setup_reply_btns();
   }, false);