diff -r 95b419e054fa -r dcb1d5a7ea3a src/main/webapp/WEB-INF/jsp/issue-form.jsp
--- a/src/main/webapp/WEB-INF/jsp/issue-form.jsp	Wed Aug 18 16:02:40 2021 +0200
+++ b/src/main/webapp/WEB-INF/jsp/issue-form.jsp	Thu Aug 19 14:51:04 2021 +0200
@@ -125,19 +125,27 @@
         <tr>
             <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}"/>
-                <c:set var="data" value="${issue.affectedVersions}" />
-                <%@include file="../jspf/version-list.jspf"%>
+                <select id="issue-affected" name="affected">
+                    <option value="-1"><fmt:message key="placeholder.null-version"/></option>
+                    <c:forEach var="vselitem" items="${viewmodel.versionsRecent}">
+                        <option value="${vselitem.id}" <c:if test="${issue.affected eq vselitem}">selected</c:if> >
+                            <c:out value="${vselitem.name}" />
+                        </option>
+                    </c:forEach>
+                </select>
             </td>
         </tr>
         <tr>
             <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}"/>
-                <c:set var="data" value="${issue.resolvedVersions}" />
-                <%@include file="../jspf/version-list.jspf"%>
+                <select id="issue-resolved" name="resolved">
+                    <option value="-1"><fmt:message key="placeholder.null-version"/></option>
+                    <c:forEach var="vselitem" items="${viewmodel.versionsUpcoming}">
+                        <option value="${vselitem.id}" <c:if test="${issue.resolved eq vselitem}">selected</c:if> >
+                            <c:out value="${vselitem.name}" />
+                        </option>
+                    </c:forEach>
+                </select>
             </td>
         </tr>
         </c:if>