diff --git a/assets/vue/mixins/CreateMixin.js b/assets/vue/mixins/CreateMixin.js
index 7edf08581c..c913e98e09 100644
--- a/assets/vue/mixins/CreateMixin.js
+++ b/assets/vue/mixins/CreateMixin.js
@@ -98,7 +98,7 @@ export default {
   },
   watch: {
     created(created) {
-      console.log('created');
+      console.log('CreateMixin.js::created');
       console.log(created);
 
       if (!created) {
diff --git a/assets/vue/views/ccalendarevent/List.vue b/assets/vue/views/ccalendarevent/List.vue
index 22542d4dd5..118cea0277 100644
--- a/assets/vue/views/ccalendarevent/List.vue
+++ b/assets/vue/views/ccalendarevent/List.vue
@@ -94,7 +94,6 @@ import {ENTRYPOINT} from "../../config/entrypoint";
 import {useI18n} from "vue-i18n";
 import allLocales from '@fullcalendar/core/locales-all';
 import toInteger from "lodash/toInteger";
-
 const servicePrefix = 'CCalendarEvent';
 
 export default {
@@ -140,6 +139,11 @@ export default {
     const sid = toInteger(route.query.sid);
     const gid = toInteger(route.query.gid);
 
+    if (cid) {
+      let courseIri = '/api/courses/' + cid;
+      store.dispatch('course/findCourse', { id: courseIri });
+    }
+
     function onCreated(item) {
       //showNotification(t('Updated'));
       reFetch();
diff --git a/assets/vue/views/ctoolintro/Create.vue b/assets/vue/views/ctoolintro/Create.vue
index 8582299d5f..ddb7f115b2 100644
--- a/assets/vue/views/ctoolintro/Create.vue
+++ b/assets/vue/views/ctoolintro/Create.vue
@@ -27,6 +27,7 @@ import axios from 'axios'
 import { ENTRYPOINT } from '../../config/entrypoint'
 import useNotification from "../../components/Notification";
 import {useI18n} from "vue-i18n";
+import toInteger from "lodash/toInteger";
 const servicePrefix = 'ctoolintro';
 
 const { mapFields } = createHelpers({
@@ -51,12 +52,19 @@ export default {
     const router = useRouter();
     const {showNotification} = useNotification();
     const { t } = useI18n();
+    const store = useStore();
 
     let id = route.params.id;
     if (isEmpty(id)) {
       id = route.query.id;
     }
 
+    const cid = toInteger(route.query.cid);
+    if (cid) {
+      let courseIri = '/api/courses/' + cid;
+      store.dispatch('course/findCourse', { id: courseIri });
+    }
+
     let toolId = route.params.courseTool;
 
     // Get the current intro text.
diff --git a/assets/vue/views/ctoolintro/Update.vue b/assets/vue/views/ctoolintro/Update.vue
index 9d3de0c5b3..0af399ba08 100644
--- a/assets/vue/views/ctoolintro/Update.vue
+++ b/assets/vue/views/ctoolintro/Update.vue
@@ -2,19 +2,17 @@
   <Toolbar
       :handle-submit="onSendForm"
   />
-
-    <ToolIntroForm
-        ref="updateForm"
-        v-if="item"
-        :values="item"
-        :errors="violations"
-    />
-    <Loading :visible="isLoading || deleteLoading" />
-
+  <ToolIntroForm
+      ref="updateForm"
+      v-if="item"
+      :values="item"
+      :errors="violations"
+  />
+  <Loading :visible="isLoading || deleteLoading"/>
 </template>
 
 <script>
-import { mapActions, mapGetters } from 'vuex';
+import {mapActions, mapGetters, useStore} from 'vuex';
 import { mapFields } from 'vuex-map-fields';
 import ToolIntroForm from '../../components/ctoolintro/Form.vue';
 import Loading from '../../components/Loading.vue';
@@ -22,8 +20,9 @@ import Toolbar from '../../components/Toolbar.vue';
 import UpdateMixin from '../../mixins/UpdateMixin';
 import useNotification from "../../components/Notification";
 import {useI18n} from "vue-i18n";
-import {useRouter} from "vue-router";
+import {useRoute, useRouter} from "vue-router";
 import {watch} from "vue";
+import toInteger from "lodash/toInteger";
 
 const servicePrefix = 'ctoolintro';
 
@@ -40,6 +39,13 @@ export default {
     const {showNotification} = useNotification();
     const { t } = useI18n();
     const router = useRouter();
+    const route = useRoute();
+    const store = useStore();
+    const cid = toInteger(route.query.cid);
+    if (cid) {
+      let courseIri = '/api/courses/' + cid;
+      store.dispatch('course/findCourse', { id: courseIri });
+    }
 
     /*function updated(val) {
       showNotification(t('Updated'));