diff --git a/client/src/components/dashboard/MentorMenteeCount.vue b/client/src/components/dashboard/AgentConnectionCount.vue
similarity index 100%
rename from client/src/components/dashboard/MentorMenteeCount.vue
rename to client/src/components/dashboard/AgentConnectionCount.vue
diff --git a/client/src/components/dashboard/BerufsbildnerStatistics.vue b/client/src/components/dashboard/BerufsbildnerStatistics.vue
index 5228b740..29c35afd 100644
--- a/client/src/components/dashboard/BerufsbildnerStatistics.vue
+++ b/client/src/components/dashboard/BerufsbildnerStatistics.vue
@@ -9,7 +9,7 @@ import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
 import AssignmentSummaryBox from "@/components/dashboard/AssignmentSummaryBox.vue";
 import BaseBox from "@/components/dashboard/BaseBox.vue";
 import { percentToRoundedGrade } from "@/services/assignmentService";
-import MentorMenteeCount from "@/components/dashboard/MentorMenteeCount.vue";
+import AgentConnectionCount from "@/components/dashboard/AgentConnectionCount.vue";
 
 const props = defineProps<{
   courseSlug: string;
@@ -24,6 +24,10 @@ const assignmentStats = computed(() => {
   return mentorData.value?.assignments ?? null;
 });
 
+const numberOfPerson = computed(() => {
+  return mentorData.value?.user_selection_ids?.length ?? 0;
+});
+
 onMounted(async () => {
   mentorData.value = await fetchMentorCompetenceSummary(
     props.courseId,
@@ -79,10 +83,10 @@ const averageGrade = computed(() => {
         :details-link="`/statistic/berufsbildner/${props.courseSlug}/assignment`"
       />
     </div>
-    <MentorMenteeCount
+    <AgentConnectionCount
       :course-id="props.courseId"
       :course-slug="props.courseSlug"
-      :count="mentorData.user_selection_ids.length"
+      :count="numberOfPerson"
       :slim="true"
     />
   </div>
diff --git a/client/src/components/dashboard/CoursePanel.vue b/client/src/components/dashboard/CoursePanel.vue
index 4b052c48..e052a9af 100644
--- a/client/src/components/dashboard/CoursePanel.vue
+++ b/client/src/components/dashboard/CoursePanel.vue
@@ -5,7 +5,7 @@ import LearningPathDiagram from "@/components/learningPath/LearningPathDiagram.v
 import CompetenceSummary from "@/components/dashboard/CompetenceSummary.vue";
 import AssignmentSummary from "@/components/dashboard/AssignmentSummary.vue";
 import MentorOpenTasksCount from "@/components/dashboard/MentorOpenTasksCount.vue";
-import MentorMenteeCount from "@/components/dashboard/MentorMenteeCount.vue";
+import AgentConnectionCount from "@/components/dashboard/AgentConnectionCount.vue";
 import MentorCompetenceSummary from "@/components/dashboard/MentorCompetenceSummary.vue";
 import { getCockpitUrl, getLearningMentorUrl, getLearningPathUrl } from "@/utils/utils";
 import UkStatistics from "@/components/dashboard/UkStatistics.vue";
@@ -177,7 +177,7 @@ function hasActionButton(): boolean {
         v-if="numberOfMentorWidgets > 0"
         class="flex flex-col flex-wrap items-stretch md:flex-row"
       >
-        <MentorMenteeCount
+        <AgentConnectionCount
           v-if="hasWidget('MentorPersonWidget')"
           :course-id="courseConfig.course_id"
           :course-slug="courseConfig?.course_slug"