diff -r 91d1fc2a3a14 -r 33b6843fdf8a src/main/webapp/WEB-INF/jsp/version-form.jsp
--- a/src/main/webapp/WEB-INF/jsp/version-form.jsp	Fri May 22 17:26:27 2020 +0200
+++ b/src/main/webapp/WEB-INF/jsp/version-form.jsp	Fri May 22 21:23:57 2020 +0200
@@ -44,7 +44,7 @@
         <tbody>
         <tr>
             <th><fmt:message key="thead.version.name"/></th>
-            <td><input name="name" type="text" maxlength="20" required value="${version.name}"/></td>
+            <td><input name="name" type="text" maxlength="20" required value="<c:out value="${version.name}"/>" /></td>
         </tr>
         <tr>
             <th><fmt:message key="thead.version.status"/></th>
@@ -69,8 +69,9 @@
         <tr>
             <td colspan="2">
                 <input type="hidden" name="id" value="${version.id}"/>
-                <a href="./${moduleInfo.modulePath}/versions/" class="button"><fmt:message bundle="${lightpit_bundle}"
-                                                                                           key="button.cancel"/></a>
+                <a href="./${moduleInfo.modulePath}/view?pid=${version.project.id}" class="button">
+                    <fmt:message bundle="${lightpit_bundle}" key="button.cancel"/>
+                </a>
                 <button type="submit"><fmt:message bundle="${lightpit_bundle}" key="button.okay"/></button>
             </td>
         </tr>