diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplateComponentPanel.html b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplateComponentPanel.html
index ddac0bb533..bcb83d5840 100644
--- a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplateComponentPanel.html
+++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplateComponentPanel.html
@@ -115,7 +115,7 @@
                         </fieldset>
                     </li>
                     <li>
-                        <div class="row align-items-center" wicket:id="new_point_form">
+                        <div class="row align-items-center">
                             <label class="col-auto">
                                 <wicket:container wicket:id="new_point"/>
                             </label>
diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplateComponentPanel.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplateComponentPanel.java
index 13666a558c..73e3b61c6a 100644
--- a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplateComponentPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplateComponentPanel.java
@@ -3,11 +3,9 @@ package se.su.dsv.scipro.admin.pages.grading;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
 import org.apache.wicket.markup.html.GenericWebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.EnumChoiceRenderer;
-import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.NumberTextField;
 import org.apache.wicket.markup.html.form.RequiredTextField;
 import org.apache.wicket.markup.html.form.TextArea;
@@ -117,16 +115,13 @@ class EditingGradingTemplateComponentPanel extends GenericPanel<EditingGradingTe
                 }
             });
 
-            Form<Object> newPointForm = new Form<>("new_point_form");
-            add(newPointForm);
-
-            newPointForm.add(new Label("new_point", model
+            add(new Label("new_point", model
                     .map(criteria -> criteria.getPoints().size())
                     .map(size -> "Requirement for " + (size + 1) + " points")));
 
-            newPointForm.add(new AjaxSubmitLink("add_new_point", newPointForm) {
+            add(new AjaxLink<>("add_new_point") {
                 @Override
-                public void onSubmit(AjaxRequestTarget target) {
+                public void onClick(AjaxRequestTarget target) {
                     EditingGradingTemplate.Criteria criteria = model.getObject();
                     EditingGradingTemplate.Criteria.Point newPoint = criteria.new Point();
                     criteria.getPoints().add(newPoint);