diff --git a/src/main/java/org/olat/commons/calendar/restapi/CalendarWSHelper.java b/src/main/java/org/olat/commons/calendar/restapi/CalendarWSHelper.java
index 1451100bb4a8210b805dbb6a7670b7fe03083caf..372f0ca2397455a09eeee29f5c2f504cbfb54e03 100644
--- a/src/main/java/org/olat/commons/calendar/restapi/CalendarWSHelper.java
+++ b/src/main/java/org/olat/commons/calendar/restapi/CalendarWSHelper.java
@@ -51,6 +51,8 @@ public class CalendarWSHelper {
 		kalEvent.setLocation(event.getLocation());
 		kalEvent.setManagedFlags(CalendarManagedFlag.toEnum(event.getManagedFlags()));
 		kalEvent.setAllDayEvent(event.isAllDayEvent());
+        kalEvent.setExternalId(event.getExternalId());
+        kalEvent.setExternalSource(event.getExternalSource());
 	}
 	
 	protected static boolean hasReadAccess(KalendarRenderWrapper wrapper) {
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestComposerController.java b/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestComposerController.java
index d637e4911231cb3dad56b7f3be0ef6e5bb305687..0c42b30aedecedf04729d269160bbf5df669b16b 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestComposerController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestComposerController.java
@@ -441,11 +441,13 @@ public class AssessmentTestComposerController extends MainLayoutBasicController
 			AssessmentTestEvent ate = (AssessmentTestEvent)event;
 			if(ate == AssessmentTestEvent.ASSESSMENT_TEST_CHANGED_EVENT) {
 				AssessmentTest ast = assessmentTestBuilder.getAssessmentTest();
+				assessmentChanged(ureq);
 				doUpdate(ast.getIdentifier(), ast.getTitle());
 			}
 		} else if(event instanceof AssessmentTestPartEvent) {
 			AssessmentTestPartEvent atpe = (AssessmentTestPartEvent)event;
 			if(atpe == AssessmentTestPartEvent.ASSESSMENT_TEST_PART_CHANGED_EVENT) {
+				assessmentChanged(ureq);
 				doSaveAssessmentTest(ureq, null);
 			}
 		} else if(event instanceof AssessmentSectionEvent) {