diff --git a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentIntroductionView.vue b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentIntroductionView.vue
index f6c1ac16..f4b93a95 100644
--- a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentIntroductionView.vue
+++ b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentIntroductionView.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import DateEmbedding from "@/components/dueDates/DateEmbedding.vue";
+import RichText from "@/components/ui/RichText.vue";
 import type { Assignment } from "@/types";
 import { useRouteQuery } from "@vueuse/router";
-import log from "loglevel";
 import dayjs from "dayjs";
-import RichText from "@/components/ui/RichText.vue";
+import log from "loglevel";
 
 interface Props {
   assignment: Assignment;
@@ -40,15 +40,13 @@ const step = useRouteQuery("step");
     </li>
   </ul>
 
-  <h3 class="mb-4 mt-8">{{ $t("assignment.dueDateSubmission") }}</h3>
-
-  <p v-if="submissionDeadlineStart" class="text-large">
+  <div v-if="submissionDeadlineStart" class="text-large">
+    <h3 class="mb-4 mt-8">{{ $t("assignment.dueDateSubmission") }}</h3>
     {{ $t("assignment.dueDateIntroduction") }}
-    <DateEmbedding :single-date="dayjs(submissionDeadlineStart)"></DateEmbedding>
-  </p>
-  <p v-else class="text-large">
-    {{ $t("assignment.dueDateNotSet") }}
-  </p>
+    <p>
+      <DateEmbedding :single-date="dayjs(submissionDeadlineStart)"></DateEmbedding>
+    </p>
+  </div>
 
   <div v-if="props.assignment.effort_required">
     <h3 class="mb-4 mt-8">{{ $t("assignment.effortTitle") }}</h3>
diff --git a/server/vbv_lernwelt/course_session/admin.py b/server/vbv_lernwelt/course_session/admin.py
index 7f69ef77..744590f6 100644
--- a/server/vbv_lernwelt/course_session/admin.py
+++ b/server/vbv_lernwelt/course_session/admin.py
@@ -74,12 +74,6 @@ class CourseSessionAttendanceCourseAdmin(admin.ModelAdmin):
 
 @admin.register(CourseSessionAssignment)
 class CourseSessionAssignmentAdmin(admin.ModelAdmin):
-    readonly_fields = [
-        "course_session",
-        "learning_content",
-        "submission_deadline",
-        "evaluation_deadline",
-    ]
     list_display = [
         "course_session",
         "circle",
@@ -88,6 +82,11 @@ class CourseSessionAssignmentAdmin(admin.ModelAdmin):
         "evaluation_date",
     ]
     list_filter = ["course_session__course", "course_session"]
+    raw_id_fields = [
+        "course_session",
+        "submission_deadline",
+        "evaluation_deadline",
+    ]
 
     def submission_date(self, obj):
         if obj.submission_deadline:
@@ -124,7 +123,7 @@ class CourseSessionAssignmentAdmin(admin.ModelAdmin):
         readonly_fields = super(CourseSessionAssignmentAdmin, self).get_readonly_fields(
             request, obj
         )
-        return readonly_fields + ["circle_display"]
+        return ["circle_display"]
 
     # Override get_form to include circle_display
     def get_form(self, request, obj=None, **kwargs):
diff --git a/server/vbv_lernwelt/course_session/models.py b/server/vbv_lernwelt/course_session/models.py
index 4f1dc3b3..0f328bad 100644
--- a/server/vbv_lernwelt/course_session/models.py
+++ b/server/vbv_lernwelt/course_session/models.py
@@ -109,6 +109,7 @@ class CourseSessionAssignment(models.Model):
         on_delete=models.CASCADE,
         related_name="assignment_submission_deadline",
         null=True,
+        blank=True,
     )
 
     evaluation_deadline = models.OneToOneField(
@@ -116,6 +117,7 @@ class CourseSessionAssignment(models.Model):
         on_delete=models.CASCADE,
         related_name="assignment_evaluation_deadline",
         null=True,
+        blank=True,
     )
 
     class Meta:
diff --git a/server/vbv_lernwelt/learnpath/models.py b/server/vbv_lernwelt/learnpath/models.py
index ac30d325..da56a8fc 100644
--- a/server/vbv_lernwelt/learnpath/models.py
+++ b/server/vbv_lernwelt/learnpath/models.py
@@ -441,6 +441,9 @@ class LearningContentAssignment(LearningContent):
         self.assignment_type = self.content_assignment.assignment_type
         super().save(**kwargs)
 
+    def __str__(self):
+        return f"{self.id} - {self.title}"
+
     @classmethod
     def get_serializer_class(cls):
         from vbv_lernwelt.learnpath.serializers import (