diff -r 5b55a5318a83 -r 69647ddb57f2 src/main/webapp/WEB-INF/jsp/issue-form.jsp
--- a/src/main/webapp/WEB-INF/jsp/issue-form.jsp	Mon Aug 09 15:50:37 2021 +0200
+++ b/src/main/webapp/WEB-INF/jsp/issue-form.jsp	Mon Aug 09 16:22:56 2021 +0200
@@ -52,9 +52,9 @@
         </tr>
         </c:if>
         <tr>
-            <th><fmt:message key="component"/></th>
+            <th><label for="issue-component"><fmt:message key="component"/></label></th>
             <td>
-                <select name="component">
+                <select id="issue-component" name="component">
                     <option value="-1"><fmt:message key="placeholder.null-component"/></option>
                     <c:forEach var="comp" items="${viewmodel.components}">
                         <option
@@ -65,9 +65,9 @@
             </td>
         </tr>
         <tr>
-            <th><fmt:message key="issue.category"/></th>
+            <th><label for="issue-category"><fmt:message key="issue.category"/></label></th>
             <td>
-                <select name="category">
+                <select id="issue-category" name="category">
                     <c:forEach var="category" items="${viewmodel.issueCategory}">
                         <option
                                 <c:if test="${category eq issue.category}">selected</c:if>
@@ -79,9 +79,9 @@
             </td>
         </tr>
         <tr>
-            <th><fmt:message key="issue.status"/></th>
+            <th><label for="issue-status"><fmt:message key="issue.status"/></label></th>
             <td>
-                <select name="status">
+                <select id="issue-status" name="status">
                     <c:forEach var="status" items="${viewmodel.issueStatus}">
                         <option
                                 <c:if test="${status eq issue.status}">selected</c:if>
@@ -93,19 +93,19 @@
             </td>
         </tr>
         <tr>
-            <th><fmt:message key="issue.subject"/></th>
-            <td><input name="subject" type="text" maxlength="200" required value="<c:out value="${issue.subject}"/>" /></td>
+            <th><label for="issue-subject"><fmt:message key="issue.subject"/></label></th>
+            <td><input id="issue-subject" name="subject" type="text" maxlength="200" required value="<c:out value="${issue.subject}"/>" /></td>
         </tr>
         <tr>
-            <th class="vtop"><fmt:message key="issue.description"/></th>
+            <th class="vtop"><label for="issue-description"><fmt:message key="issue.description"/></label></th>
             <td>
-                <textarea name="description" rows="10"><c:out value="${issue.description}"/></textarea>
+                <textarea id="issue-description" name="description" rows="10"><c:out value="${issue.description}"/></textarea>
             </td>
         </tr>
         <tr>
-            <th><fmt:message key="issue.assignee"/></th>
+            <th><label for="issue-assignee"><fmt:message key="issue.assignee"/></label></th>
             <td>
-                <select name="assignee">
+                <select id="issue-assignee" name="assignee">
                     <option value="-2" title="<fmt:message key="placeholder.auto-assignee.tooltip"/>"><fmt:message key="placeholder.auto-assignee"/></option>
                     <option value="-1"
                             <c:if test="${issue.id ge 0 and empty issue.assignee}">selected</c:if>
@@ -120,7 +120,7 @@
         </tr>
         <c:if test="${issue.project.id ge 0}">
         <tr>
-            <th class="vtop"><fmt:message key="issue.affected-versions"/></th>
+            <th class="vtop"><label for="issue-affected"><fmt:message key="issue.affected-versions"/></label></th>
             <td>
                 <c:set var="fieldname" value="affected"/>
                 <c:set var="selectionList" value="${viewmodel.versionsRecent}"/>
@@ -129,7 +129,7 @@
             </td>
         </tr>
         <tr>
-            <th class="vtop"><fmt:message key="issue.resolved-versions"/></th>
+            <th class="vtop"><label for="issue-resolved"><fmt:message key="issue.resolved-versions"/></label></th>
             <td>
                 <c:set var="fieldname" value="resolved"/>
                 <c:set var="selectionList" value="${viewmodel.versionsUpcoming}"/>
@@ -139,9 +139,15 @@
         </tr>
         </c:if>
         <tr>
-            <th><fmt:message key="issue.eta"/></th>
-            <td><input name="eta" type="date" value="<fmt:formatDate value="${issue.eta}" pattern="YYYY-MM-dd" />" /> </td>
+            <th><label for="issue-eta"><fmt:message key="issue.eta"/></label></th>
+            <td><input id="issue-eta" name="eta" type="date" value="<fmt:formatDate value="${issue.eta}" pattern="YYYY-MM-dd" />" /> </td>
         </tr>
+        <c:if test="${issue.id ge 0}">
+        <tr>
+            <th class="vtop"><label for="issue-comment"><fmt:message key="issue.comment"/></label> </th>
+            <td><textarea id="issue-comment" rows="3" name="comment"></textarea></td>
+        </tr>
+        </c:if>
         </tbody>
         <tfoot>
         <tr>