diff --git a/appview/pages/templates/fragments/issueComment.html b/appview/pages/templates/fragments/issueComment.html
index 21b12662..1c3161a7 100644
--- a/appview/pages/templates/fragments/issueComment.html
+++ b/appview/pages/templates/fragments/issueComment.html
@@ -28,7 +28,7 @@
         {{ end }}
       </a>
 
-      {{ $isCommentOwner := eq $.LoggedInUser.Did .OwnerDid }}
+      {{ $isCommentOwner := and $.LoggedInUser (eq $.LoggedInUser.Did .OwnerDid) }}
       {{ if and $isCommentOwner (not .Deleted) }}
       <button 
         class="btn px-2 py-1 text-sm" 
@@ -41,6 +41,7 @@
       <button 
         class="btn px-2 py-1 text-sm text-red-500"
         hx-delete="/{{ $.RepoInfo.FullName }}/issues/{{ .Issue }}/comment/{{ .CommentId }}/"
+        hx-confirm="Are you sure you want to delete your comment?"
         hx-swap="outerHTML"
         hx-target="#comment-container-{{.CommentId}}"
         >
diff --git a/appview/pages/templates/repo/issues/issue.html b/appview/pages/templates/repo/issues/issue.html
index 901b8fa6..d4c0de46 100644
--- a/appview/pages/templates/repo/issues/issue.html
+++ b/appview/pages/templates/repo/issues/issue.html
@@ -107,7 +107,7 @@
       </form>
     </div>
   {{ else }}
-    <div class="bg-white rounded drop-shadow-sm px-6 py-4 mt-8">
+    <div class="bg-white dark:bg-gray-800 dark:text-gray-400 rounded drop-shadow-sm px-6 py-4 mt-8">
       <div class="absolute left-8 -top-8 w-px h-8 bg-gray-300 dark:bg-gray-700" ></div>
       <a href="/login" class="underline">login</a> to join the discussion
     </div>