--- a/src/main/webapp/WEB-INF/jsp/issue-view.jsp	Tue Jan 06 20:08:54 2026 +0100
+++ b/src/main/webapp/WEB-INF/jsp/issue-view.jsp	Thu Feb 19 17:13:07 2026 +0100
@@ -200,6 +200,11 @@
         <fmt:message key="button.issue.open-in-project"/>
     </a>
     </c:if>
+    <c:if test="${not viewmodel.assignedToAuthenticatedUser}">
+        <a href="${issuesHref}${issue.id}/assign" class="button submit">
+            <fmt:message key="button.issue.assign-myself"/>
+        </a>
+    </c:if>
     <c:if test="${not issue.trackingVariantStatus or empty viewmodel.openedVariant}">
         <c:set scope="page" var="workflowPhase" value="${issue.minimumStatusPhaseAcrossAllVariants}"/>
     </c:if>
@@ -362,7 +367,7 @@
                 <c:if test="${not empty comment.author.mail}">
                     </a>
                 </c:if>
-                <c:if test="${comment.author.username eq pageContext.request.remoteUser}">
+                <c:if test="${comment.author eq viewmodel.authenticatedUser}">
                     <a class="comment-edit-icon" onclick="showCommentEditor(${comment.id})">&#x270e;</a>
                 </c:if>
             </c:if>