diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_tan.xml b/Corona-Warn-App/src/main/res/layout/include_submission_tan.xml
index c4d3a8243d0c1005b0c8069bfaeb76f382473c91..7160dcfb1c422f1103c0c12c02d01780f19529cb 100644
--- a/Corona-Warn-App/src/main/res/layout/include_submission_tan.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_submission_tan.xml
@@ -46,13 +46,13 @@
                 app:layout_constraintTop_toBottomOf="@+id/submission_tan_body" />
 
             <TextView
-                android:id="@+id/submission_tan_character_error"
+                android:id="@+id/submission_tan_error"
                 style="@style/subtitle"
                 android:layout_width="@dimen/match_constraint"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/spacing_small"
                 android:accessibilityLiveRegion="assertive"
-                android:text="@string/submission_tan_character_error"
+                android:text="@string/submission_tan_error"
                 android:textColor="@color/colorTextSemanticRed"
                 android:visibility="gone"
                 app:layout_constraintEnd_toStartOf="@+id/guideline_end"
@@ -61,18 +61,18 @@
                 tools:visibility="visible" />
 
             <TextView
-                android:id="@+id/submission_tan_error"
+                android:id="@+id/submission_tan_character_error"
                 style="@style/subtitle"
                 android:layout_width="@dimen/match_constraint"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/spacing_small"
                 android:accessibilityLiveRegion="assertive"
-                android:text="@string/submission_tan_error"
+                android:text="@string/submission_tan_character_error"
                 android:textColor="@color/colorTextSemanticRed"
                 android:visibility="gone"
                 app:layout_constraintEnd_toStartOf="@+id/guideline_end"
                 app:layout_constraintStart_toStartOf="@+id/guideline_start"
-                app:layout_constraintTop_toBottomOf="@id/submission_tan_character_error"
+                app:layout_constraintTop_toBottomOf="@id/submission_tan_error"
                 tools:visibility="visible" />
 
             <include layout="@layout/merge_guidelines_side" />
diff --git a/Corona-Warn-App/src/main/res/values-de/strings.xml b/Corona-Warn-App/src/main/res/values-de/strings.xml
index 8f37980ba11b90d72058e28fd36cbf1c4581f7e4..dc4821c23123b16c1e6581eccdb3abeab5b750e1 100644
--- a/Corona-Warn-App/src/main/res/values-de/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/strings.xml
@@ -884,9 +884,9 @@
     <!-- XACT: Submission Tan page title -->
     <string name="submission_tan_accessibility_title">"TAN-Eingabe"</string>
     <!-- YTXT: Error text for the tan submission page -->
-    <string name="submission_tan_error">"Ungültige TAN, bitte überprüfen Sie Ihre Eingabe."</string>
+    <string name="submission_tan_error">"Ungültige TAN. Bitte überprüfen Sie Ihre Eingabe."</string>
     <!-- YTXT: Error text for the tan submission page (wrong characters) -->
-    <string name="submission_tan_character_error">"Ungültige Eingabe, bitte überprüfen Sie das Zeichen."</string>
+    <string name="submission_tan_character_error">"Ihre Eingabe enthält ein ungültiges Zeichen. Bitte überprüfen Sie Ihre Eingabe."</string>
 
     <!-- Submission Intro -->
     <!-- XHED: Page title for menu at the start of the submission process  -->