diff --git a/src/Form/AssignmentType.php b/src/Form/AssignmentType.php
index 99c8f67..e833504 100644
--- a/src/Form/AssignmentType.php
+++ b/src/Form/AssignmentType.php
@@ -53,11 +53,11 @@ class AssignmentType extends AbstractType
                 'required' => false,
             ])
             ->add('pickupDate', DatepickerType::class, [
-                'label' => 'abweichende Busabfahrt',
+                'label' => 'abweichender Zustieg bei Busbegleitung',
                 'required' => false,
             ])
             ->add('pickup', BpnPickupType::class, [
-                'label' => 'Buszustieg',
+                'label' => 'Busbegleitung ab',
                 'required' => false,
                 'placeholder' => 'Keine Busbegleitung',
             ])
diff --git a/templates/_partials/_assignment_info.html.twig b/templates/_partials/_assignment_info.html.twig
index 65186b1..8756e50 100644
--- a/templates/_partials/_assignment_info.html.twig
+++ b/templates/_partials/_assignment_info.html.twig
@@ -23,15 +23,7 @@
             {{ assignment.effectivePeriod.start|date('d.m.Y') }} - {{ assignment.effectivePeriod.end|date('d.m.Y') }}
         </dd>
     </div>
-    {% if assignment.pickup and assignment.pickupDate %}
-        <div class="py-6 first:pt-0 last:pb-0 sm:grid sm:grid-cols-3 sm:gap-4">
-            <dt class="text-sm font-bold leading-6 text-gray-900">
-                Busabfahrt
-            </dt>
-            <dd class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0">
-                {{ assignment.pickupDate|date('d.m.Y') }}
-            </dd>
-        </div>
+    {% if assignment.pickup %}
         <div class="py-6 first:pt-0 last:pb-0 sm:grid sm:grid-cols-3 sm:gap-4">
             <dt class="text-sm font-bold leading-6 text-gray-900">
                 Busbegleitung
@@ -40,6 +32,16 @@
                 {{ assignment.pickup|bpn_pickup_label }}
             </dd>
         </div>
+        {% if assignment.pickupDate %}
+            <div class="py-6 first:pt-0 last:pb-0 sm:grid sm:grid-cols-3 sm:gap-4">
+                <dt class="text-sm font-bold leading-6 text-gray-900">
+                    Busabfahrt
+                </dt>
+                <dd class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0">
+                    {{ assignment.pickupDate|date('d.m.Y') }}
+                </dd>
+            </div>
+        {% endif %}
     {% endif %}
     <div class="py-6 first:pt-0 last:pb-0 sm:grid sm:grid-cols-3 sm:gap-4">
         <dt class="text-sm font-bold leading-6 text-gray-900">
diff --git a/templates/_partials/_assignment_info_compact.html.twig b/templates/_partials/_assignment_info_compact.html.twig
index b92c0db..4cb6cf8 100644
--- a/templates/_partials/_assignment_info_compact.html.twig
+++ b/templates/_partials/_assignment_info_compact.html.twig
@@ -26,15 +26,7 @@
         </div>
     </dl>
     <dl class="divide-y divide-gray-100">
-        {% if assignment.pickup and assignment.pickupDate %}
-            <div class="py-6 first:pt-0 last:pb-0 sm:grid sm:grid-cols-3 sm:gap-4">
-                <dt class="text-sm font-bold leading-6 text-gray-900">
-                    Busabfahrt
-                </dt>
-                <dd class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0">
-                    {{ assignment.pickupDate|date('d.m.Y') }}
-                </dd>
-            </div>
+        {% if assignment.pickup %}
             <div class="py-6 first:pt-0 last:pb-0 sm:grid sm:grid-cols-3 sm:gap-4">
                 <dt class="text-sm font-bold leading-6 text-gray-900">
                     Busbegleitung
@@ -43,6 +35,16 @@
                     {{ assignment.pickup|bpn_pickup_label }}
                 </dd>
             </div>
+            {% if assignment.pickupDate %}
+                <div class="py-6 first:pt-0 last:pb-0 sm:grid sm:grid-cols-3 sm:gap-4">
+                    <dt class="text-sm font-bold leading-6 text-gray-900">
+                        Busabfahrt
+                    </dt>
+                    <dd class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0">
+                        {{ assignment.pickupDate|date('d.m.Y') }}
+                    </dd>
+                </div>
+            {% endif %}
         {% endif %}
         <div class="py-6 first:pt-0 last:pb-0 sm:grid sm:grid-cols-3 sm:gap-4">
             <dt class="text-sm font-bold leading-6 text-gray-900">
diff --git a/templates/admin/assignment/_form.html.twig b/templates/admin/assignment/_form.html.twig
index ebf22b1..f00c274 100644
--- a/templates/admin/assignment/_form.html.twig
+++ b/templates/admin/assignment/_form.html.twig
@@ -33,8 +33,8 @@
         {{ form_row(form.contact) }}
     </div>
     <div class="grid lg:grid-cols-2 gap-x-8 gap-y-4">
-        {{ form_row(form.pickupDate) }}
         {{ form_row(form.pickup) }}
+        {{ form_row(form.pickupDate) }}
     </div>
     <div class="grid lg:grid-cols-2 gap-x-8 gap-y-4">
         {{ form_row(form.benefits) }}