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 f063e73553..0e014b120c 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
@@ -47,7 +47,7 @@
                     <li wicket:id="points">
                         <fieldset wicket:id="point" class="card mb-3">
                             <legend class="card-header hstack justify-content-between">
-                                <span wicket:id="point"></span>
+                                <span>Requirement for <span wicket:id="point"></span> point(s)</span>
                                 <button class="btn btn-sm btn-outline-danger" wicket:id="remove">Remove</button>
                             </legend>
                             <div class="card-body">
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 43bb0df75f..630a8138c1 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
@@ -69,7 +69,7 @@ class EditingGradingTemplateComponentPanel extends GenericPanel<EditingGradingTe
             add(new ListView<>("points", model.map(EditingGradingTemplate.Criteria::getPoints)) {
                 @Override
                 protected void populateItem(ListItem<EditingGradingTemplate.Criteria.Point> item) {
-                    item.add(new PointEditingPanel("point", item.getModel()));
+                    item.add(new PointEditingPanel("point", item));
                 }
             });
 
@@ -78,7 +78,7 @@ class EditingGradingTemplateComponentPanel extends GenericPanel<EditingGradingTe
 
             newPointForm.add(new Label("new_point", model
                     .map(criteria -> criteria.getPoints().size())
-                    .map(size -> "Requirement for " + size + " points")));
+                    .map(size -> "Requirement for " + (size + 1) + " points")));
 
             newPointForm.add(new AjaxSubmitLink("add_new_point", newPointForm) {
                 @Override
@@ -92,10 +92,12 @@ class EditingGradingTemplateComponentPanel extends GenericPanel<EditingGradingTe
         }
 
         private class PointEditingPanel extends GenericWebMarkupContainer<EditingGradingTemplate.Criteria.Point> {
-            public PointEditingPanel(String id, IModel<EditingGradingTemplate.Criteria.Point> model) {
-                super(id, model);
+            public PointEditingPanel(String id, ListItem<EditingGradingTemplate.Criteria.Point> item) {
+                super(id, item.getModel());
 
-                add(new Label("point", "Requirement for 1 point"));
+                IModel<EditingGradingTemplate.Criteria.Point> model = item.getModel();
+
+                add(new Label("point", () -> item.getIndex() + 1));
 
                 add(new TextArea<>("requirement_en", LambdaModel.of(
                         model,