diff --git a/README.md b/README.md
index c584f59e6..1aa8e17de 100644
--- a/README.md
+++ b/README.md
@@ -184,4 +184,3 @@ The branch name must match the following regular expression:
 [license-shield]: https://img.shields.io/github/license/it-at-m/eappointment.svg?style=for-the-badge
 [license-url]: https://github.com/it-at-m/eappointment/blob/main/LICENSE
 [product-screenshot]: images/screenshot.png
-
diff --git a/zmsadmin/custom_templates/block/appointment/form.twig b/zmsadmin/custom_templates/block/appointment/form.twig
index ce383aaaf..9e84d8ece 100644
--- a/zmsadmin/custom_templates/block/appointment/form.twig
+++ b/zmsadmin/custom_templates/block/appointment/form.twig
@@ -4,9 +4,9 @@
 
     {% block board_title %}
         {% if selectedProcess %}
-            <span id="appointment-edit-title" tabindex="0">Terminvereinbarung Aktualisieren</span>
+            <span id="appointment-edit-title" tabindex="0">Termin aktualisieren</span>
         {% else %}
-            Terminvereinbarung Neu
+            Termin erstellen
         {% endif %}
 
         <script>
@@ -248,7 +248,7 @@
                         {% endif %}
                         {{ formgroup(
                             {
-                                "label": "Anmerkung",
+                                "label": "Anmerkung (nur intern sichtbar)",
                                 "checked": scope.preferences.client.amendmentActivated,
                                 "class": "form-group--nomaxwidth",
                                 "errors": formData.amendment.messages
diff --git a/zmsadmin/templates/block/appointment/form.twig b/zmsadmin/templates/block/appointment/form.twig
index d82a08695..ad51430c9 100644
--- a/zmsadmin/templates/block/appointment/form.twig
+++ b/zmsadmin/templates/block/appointment/form.twig
@@ -4,9 +4,9 @@
 
     {% block board_title %}
         {% if selectedProcess %}
-            <span id="appointment-edit-title" tabindex="0">Terminvereinbarung Aktualisieren</span>
+            <span id="appointment-edit-title" tabindex="0">Termin aktualisieren</span>
         {% else %}
-            Terminvereinbarung Neu
+            Termin erstellen
         {% endif %}
 
         <script>
@@ -248,7 +248,7 @@
                         {% endif %}
                         {{ formgroup(
                             {
-                                "label": "Anmerkung",
+                                "label": "Anmerkung (nur intern sichtbar)",
                                 "checked": scope.preferences.client.amendmentActivated,
                                 "class": "form-group--nomaxwidth",
                                 "errors": formData.amendment.messages
diff --git a/zmsadmin/templates/block/appointment/formRedirect.twig b/zmsadmin/templates/block/appointment/formRedirect.twig
index d10bdc32f..08b4843b6 100644
--- a/zmsadmin/templates/block/appointment/formRedirect.twig
+++ b/zmsadmin/templates/block/appointment/formRedirect.twig
@@ -34,7 +34,7 @@
 
             {{ formgroup(
                 {
-                    "label": "Anmerkung",
+                    "label": "Anmerkung (nur intern sichtbar)",
                     "checked": scope.preferences.client.amendmentActivated,
                     "class": "form-group--nomaxwidth",
                     "errors": formData.amendment.messages
diff --git a/zmsadmin/templates/block/queue/info.twig b/zmsadmin/templates/block/queue/info.twig
index 1240a04ce..71544ebc5 100644
--- a/zmsadmin/templates/block/queue/info.twig
+++ b/zmsadmin/templates/block/queue/info.twig
@@ -102,7 +102,7 @@
                 
                     <li>
                         <div class="cell middle">
-                        <h4>{% trans %}Wartezeit für neue Spontankunden in Stunden{% endtrans %}:</h4>
+                        <h4>{% trans %}Wartezeit für neue Spontankunden in Minuten{% endtrans %}:</h4>
                         </div>
                         <div class="cell right">
                             {% if workstationInfo.workstationGhostCount == 0 %}
diff --git a/zmsadmin/tests/Zmsadmin/AppointmentFormTest.php b/zmsadmin/tests/Zmsadmin/AppointmentFormTest.php
index f6b2857e3..15337db78 100644
--- a/zmsadmin/tests/Zmsadmin/AppointmentFormTest.php
+++ b/zmsadmin/tests/Zmsadmin/AppointmentFormTest.php
@@ -57,7 +57,7 @@ public function testRendering()
             ]
         );
         $response = parent::testRendering();
-        $this->assertStringContainsString('Terminvereinbarung Neu', (string)$response->getBody());
+        $this->assertStringContainsString('Termin erstellen', (string)$response->getBody());
         $this->assertStringContainsString('title="Spontankunde"', (string)$response->getBody());
         $this->assertStringContainsString('Liste leeren', (string)$response->getBody());
     }
@@ -240,7 +240,7 @@ public function testSelectedProcess()
             ]
         );
         $response = $this->render([], ['selectedprocess' => 100044]);
-        $this->assertStringContainsString('Terminvereinbarung Aktualisieren', (string)$response->getBody());
+        $this->assertStringContainsString('Termin aktualisieren', (string)$response->getBody());
     }
 
     public function testSelectedDate()
@@ -290,7 +290,7 @@ public function testSelectedDate()
             ]
         );
         $response = $this->render([], ['selecteddate' => '2016-05-27']);
-        $this->assertStringContainsString('Terminvereinbarung Neu', (string)$response->getBody());
+        $this->assertStringContainsString('Termin erstellen', (string)$response->getBody());
         $this->assertStringContainsString('2016-05-27', (string)$response->getBody());
         $this->assertStringNotContainsString('slotCount', (string)$response->getBody());
     }
diff --git a/zmsadmin/tests/Zmsadmin/CounterQueueInfoTest.php b/zmsadmin/tests/Zmsadmin/CounterQueueInfoTest.php
index 5c235b12c..66f5d8eb7 100644
--- a/zmsadmin/tests/Zmsadmin/CounterQueueInfoTest.php
+++ b/zmsadmin/tests/Zmsadmin/CounterQueueInfoTest.php
@@ -109,7 +109,7 @@ public function testTodayWithAdditionalInfo()
             'selecteddate' => '2016-04-01'
         ], []);
         $this->assertStringContainsString('davon vor nächstem Spontankunden', (string)$response->getBody());
-        $this->assertStringContainsString('Wartezeit für neue Spontankunden in Stunden', (string)$response->getBody());
+        $this->assertStringContainsString('Wartezeit für neue Spontankunden in Minuten', (string)$response->getBody());
         
         $this->assertEquals(200, $response->getStatusCode());
     }
diff --git a/zmsdb/migrations/91732870750-custom-textfiled-label.sql b/zmsdb/migrations/91732870750-custom-textfiled-label.sql
new file mode 100644
index 000000000..0a18e708e
--- /dev/null
+++ b/zmsdb/migrations/91732870750-custom-textfiled-label.sql
@@ -0,0 +1,7 @@
+BEGIN;
+
+UPDATE `standort`
+SET `custom_text_field_label` = 'Zusätzliche Bemerkungen (für Bürger*innen sichtbar)'
+WHERE `custom_text_field_label` = '' OR `custom_text_field_label` IS NULL OR `custom_text_field_label` = 'Zusätzliche Bemerkungen';
+
+COMMIT;
\ No newline at end of file
diff --git a/zmsdb/migrations/91733411822-reserve-default-label-2.sql b/zmsdb/migrations/91733411822-reserve-default-label-2.sql
new file mode 100644
index 000000000..ab8d92769
--- /dev/null
+++ b/zmsdb/migrations/91733411822-reserve-default-label-2.sql
@@ -0,0 +1,7 @@
+BEGIN;
+
+UPDATE `standort`
+SET `custom_text_field_label` = 'Zusätzliche Bemerkungen'
+WHERE `custom_text_field_label` = '' OR `custom_text_field_label` IS NULL OR `custom_text_field_label` = 'Zusätzliche Bemerkungen (für Bürger*innen sichtbar)';
+
+COMMIT;
\ No newline at end of file