diff --git a/amd/src/creation_via_drag_and_drop.js b/amd/src/creation_via_drag_and_drop.js
index 82a7eecc94842bca7a864425a121e6c89e32a0bf..aa530d591538a7406a642719659738450303769e 100644
--- a/amd/src/creation_via_drag_and_drop.js
+++ b/amd/src/creation_via_drag_and_drop.js
@@ -118,6 +118,16 @@ define(['core/ajax',
                                                 let searchVal = selectedGrader["html_representation"];
                                                 setSelectionSafely("#id_graderselect option[value='" + searchVal + "']");
 
+                                                //setting the proglang and gradername as tag (easiest point to access selected grader name)
+                                                let tagInput = document.querySelectorAll('[id^=form_autocomplete_input]')[0];
+                                                tagInput.value = result.proglang;
+                                                enterKeyEvent(tagInput);
+                                                let gradername = document.querySelector("#id_graderselect option[value='" + searchVal + "']").text;
+                                                tagInput.value = gradername;
+                                                enterKeyEvent(tagInput);
+                                                tagInput.value = "MooPT";
+                                                enterKeyEvent(tagInput);
+
                                                 if ('result_spec' in selectedGrader) {
                                                     if ('format' in selectedGrader['result_spec']) {
                                                         searchVal = selectedGrader['result_spec']['format'];
@@ -237,3 +247,19 @@ function setSelectionSafely(query) {
     if(null !== select)
         select.selected = true;
 }
+
+function enterKeyEvent(elem) {
+        var event = new KeyboardEvent("keydown", {
+            bubbles: true,
+            cancelBubble: false, 
+            cancelable: true,
+            charCode: 0,
+            code: "Enter",
+            isTrusted: true,
+            key: "Enter",
+            keyCode: 13,
+            repeat: false,
+            type: "keydown",
+            which: 13});
+        elem.dispatchEvent(event);
+}
\ No newline at end of file