diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplate.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplate.java
index 25e6854f9b..7f3e831825 100644
--- a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplate.java
+++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplate.java
@@ -34,9 +34,14 @@ class EditingGradingTemplate implements Serializable {
     }
 
     class Criteria implements Serializable {
+        enum Flag {
+            OPPOSITION, REFLECTION
+        }
+
         private String titleSv;
         private String titleEn;
         private List<Point> points;
+        private Flag flag;
 
         Criteria(GradingCriterionTemplate criteria) {
             this.titleSv = criteria.getTitle();
@@ -65,6 +70,14 @@ class EditingGradingTemplate implements Serializable {
             this.titleEn = titleEn;
         }
 
+        public Flag getFlag() {
+            return flag;
+        }
+
+        public void setFlag(Flag flag) {
+            this.flag = flag;
+        }
+
         public List<Point> getPoints() {
             return points;
         }
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 0e014b120c..4106b664e9 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
@@ -40,6 +40,12 @@
                 </div>
             </div>
 
+            <div class="mb-3">
+                <label class="form-label" wicket:for="flag">Special flag</label>
+                <select class="form-control" wicket:id="flag"></select>
+                <small class="text-muted">You can flag a criteria if it is connected to some other part of the system</small>
+            </div>
+
             <fieldset>
                 <legend>Points</legend>
 
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 630a8138c1..5e6e081214 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
@@ -6,6 +6,7 @@ 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.TextArea;
 import org.apache.wicket.markup.html.form.TextField;
@@ -14,6 +15,9 @@ import org.apache.wicket.markup.html.list.ListView;
 import org.apache.wicket.markup.html.panel.GenericPanel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.LambdaModel;
+import se.su.dsv.scipro.components.AjaxDropDownChoice;
+
+import java.util.List;
 
 class EditingGradingTemplateComponentPanel extends GenericPanel<EditingGradingTemplate> {
     EditingGradingTemplateComponentPanel(
@@ -66,6 +70,26 @@ class EditingGradingTemplateComponentPanel extends GenericPanel<EditingGradingTe
                 }
             });
 
+            AjaxDropDownChoice<EditingGradingTemplate.Criteria.Flag> flagChoice = new AjaxDropDownChoice<>(
+                    "flag",
+                    LambdaModel.of(
+                            model,
+                            EditingGradingTemplate.Criteria::getFlag,
+                            EditingGradingTemplate.Criteria::setFlag),
+                    List.of(EditingGradingTemplate.Criteria.Flag.values()),
+                    new EnumChoiceRenderer<>(this))
+            {
+                @Override
+                public void onNewSelection(
+                        AjaxRequestTarget target,
+                        EditingGradingTemplate.Criteria.Flag objectSelected)
+                {
+                    // auto save
+                }
+            };
+            flagChoice.setNullValid(true);
+            add(flagChoice);
+
             add(new ListView<>("points", model.map(EditingGradingTemplate.Criteria::getPoints)) {
                 @Override
                 protected void populateItem(ListItem<EditingGradingTemplate.Criteria.Point> item) {
diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplateComponentPanel.utf8.properties b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplateComponentPanel.utf8.properties
new file mode 100644
index 0000000000..32c9d23c88
--- /dev/null
+++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplateComponentPanel.utf8.properties
@@ -0,0 +1,2 @@
+Flag.OPPOSITION=Final seminar opposition
+Flag.REFLECTION=Reflection