diff --git a/webapp/components/EnterNonce/EnterNonce.vue b/webapp/components/EnterNonce/EnterNonce.vue
index 6907f3e7a..5808dece4 100644
--- a/webapp/components/EnterNonce/EnterNonce.vue
+++ b/webapp/components/EnterNonce/EnterNonce.vue
@@ -8,17 +8,17 @@
     @input-valid="handleInputValid"
   >
     <ds-input
-      :placeholder="$t('components.enter-nonce.form.nonce')"
+      :placeholder="$t('components.registration.email-nonce.form.nonce')"
       model="nonce"
       name="nonce"
       id="nonce"
       icon="question-circle"
     />
     <ds-text>
-      {{ $t('components.enter-nonce.form.description') }}
+      {{ $t('components.registration.email-nonce.form.description') }}
     </ds-text>
     <base-button :disabled="disabled" filled name="submit" type="submit">
-      {{ $t('components.enter-nonce.form.next') }}
+      {{ $t('components.registration.email-nonce.form.next') }}
     </base-button>
     <slot></slot>
   </ds-form>
@@ -40,7 +40,7 @@ export default {
           min: 6,
           max: 6,
           required: true,
-          message: this.$t('components.enter-nonce.form.validations.length'), // Wolle here 6 characters are mentioned
+          message: this.$t('components.registration.email-nonce.form.validations.length'), // Wolle here 6 characters are mentioned
         },
       },
       disabled: true,
diff --git a/webapp/components/Registration/RegistrationSlideCreate.vue b/webapp/components/Registration/RegistrationSlideCreate.vue
index b5fe463f5..d7013968d 100644
--- a/webapp/components/Registration/RegistrationSlideCreate.vue
+++ b/webapp/components/Registration/RegistrationSlideCreate.vue
@@ -29,6 +29,7 @@
       </ds-heading>
     </ds-space> -->
 
+    <!-- Wolle ??? submit -->
     <ds-form
       class="create-user-account"
       v-model="formData"
@@ -208,10 +209,6 @@ export default {
           passwordConfirmation,
           termsAndConditionsConfirmed,
           recieveCommunicationAsEmailsEtcConfirmed,
-          // dataPrivacy,
-          // minimumAge,
-          // noCommercial,
-          // noPolitical,
         },
       })
     },
diff --git a/webapp/components/Registration/RegistrationSlideEmail.vue b/webapp/components/Registration/RegistrationSlideEmail.vue
index b580aa7dd..aa4be7cb2 100644
--- a/webapp/components/Registration/RegistrationSlideEmail.vue
+++ b/webapp/components/Registration/RegistrationSlideEmail.vue
@@ -35,7 +35,7 @@
     <ds-text v-if="sliderData.collectedInputData.emailSend">
       <input id="checkbox" type="checkbox" v-model="sendEmailAgain" :checked="sendEmailAgain" />
       <label for="checkbox0">
-        {{ $t('components.email.form.sendEmailAgain') }}
+        {{ $t('components.registration.email.form.sendEmailAgain') }}
       </label>
     </ds-text>
   </ds-form>
@@ -135,9 +135,9 @@ export default {
         sliderSettings: {
           buttonTitleIdent: this.sliderData.collectedInputData.emailSend
             ? this.sendEmailAgain
-              ? 'components.email.buttonTitle.resend'
-              : 'components.email.buttonTitle.skipResend'
-            : 'components.email.buttonTitle.send',
+              ? 'components.registration.email.buttonTitle.resend'
+              : 'components.registration.email.buttonTitle.skipResend'
+            : 'components.registration.email.buttonTitle.send',
           buttonIcon: this.sliderData.collectedInputData.emailSend
             ? this.sendEmailAgain
               ? 'envelope'
diff --git a/webapp/components/Registration/RegistrationSlideInvite.vue b/webapp/components/Registration/RegistrationSlideInvite.vue
index 1e26cbbe8..4571510c5 100644
--- a/webapp/components/Registration/RegistrationSlideInvite.vue
+++ b/webapp/components/Registration/RegistrationSlideInvite.vue
@@ -7,14 +7,14 @@
     @input-valid="handleInputValid"
   >
     <ds-input
-      :placeholder="$t('components.enter-invite.form.invite-code')"
+      :placeholder="$t('components.registration.invite-code.form.invite-code')"
       model="inviteCode"
       name="inviteCode"
       id="inviteCode"
       icon="question-circle"
     />
     <ds-text>
-      {{ $t('components.enter-invite.form.description') }}
+      {{ $t('components.registration.invite-code.form.description') }}
     </ds-text>
     <slot></slot>
   </ds-form>
@@ -41,11 +41,10 @@ export default {
       formSchema: {
         inviteCode: {
           type: 'string',
-          // add again if the input has a validation without focus and typing
-          // min: 6,
-          // max: 6,
+          min: 6,
+          max: 6,
           required: true,
-          // Wolle don't mention the amount of chars (remove from locales) message: this.$t('components.enter-invite.form.validations.length'),
+          message: this.$t('components.registration.invite-code.form.validations.length'),
         },
       },
       dbRequestInProgress: false,
diff --git a/webapp/components/Registration/RegistrationSlideNonce.vue b/webapp/components/Registration/RegistrationSlideNonce.vue
index bbfda2761..f04552a25 100644
--- a/webapp/components/Registration/RegistrationSlideNonce.vue
+++ b/webapp/components/Registration/RegistrationSlideNonce.vue
@@ -9,14 +9,14 @@
   >
     <email-display-and-verify :email="sliderData.collectedInputData.email" />
     <ds-input
-      :placeholder="$t('components.enter-nonce.form.nonce')"
+      :placeholder="$t('components.registration.email-nonce.form.nonce')"
       model="nonce"
       name="nonce"
       id="nonce"
       icon="question-circle"
     />
     <ds-text>
-      {{ $t('components.enter-nonce.form.description') }}
+      {{ $t('components.registration.email-nonce.form.description') }}
     </ds-text>
     <slot></slot>
   </ds-form>
@@ -48,11 +48,10 @@ export default {
       formSchema: {
         nonce: {
           type: 'string',
-          // add again if the input has a validation without focus and typing
-          // min: 5,
-          // max: 5,
+          min: 5,
+          max: 5,
           required: true,
-          message: this.$t('components.enter-nonce.form.validations.length'), // Wolle here 6 characters are mentioned
+          message: this.$t('components.registration.email-nonce.form.validations.length'),
         },
       },
       dbRequestInProgress: false,
diff --git a/webapp/components/Registration/RegistrationSlider.vue b/webapp/components/Registration/RegistrationSlider.vue
index 06f8f166f..ffb4983d8 100644
--- a/webapp/components/Registration/RegistrationSlider.vue
+++ b/webapp/components/Registration/RegistrationSlider.vue
@@ -106,7 +106,7 @@ export default {
         validated: false,
         data: { request: null, response: null },
         button: {
-          titleIdent: 'components.email.buttonTitle.send', // changed by slider component
+          titleIdent: 'components.registration.email.buttonTitle.send', // changed by slider component
           icon: 'envelope', // changed by slider component
           callback: this.buttonCallback,
           sliderCallback: null, // optional set by slot
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 6f4e1333c..1070c7748 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -120,36 +120,6 @@
     "versus": "Versus"
   },
   "components": {
-    "email": {
-      "buttonTitle": {
-        "resend": "Erneut senden",
-        "send": "Sende E-Mail",
-        "skipResend": "Nicht senden"
-      },
-      "form": {
-        "sendEmailAgain": "E-Mail erneut senden"
-      }
-    },
-    "enter-invite": {
-      "form": {
-        "description": "Gib den Einladungs-Code ein, den du bekommen hast.",
-        "invite-code": "Einladungs-Code eingeben",
-        "next": "Weiter",
-        "validations": {
-          "length": "muss genau 6 Buchstaben lang sein"
-        }
-      }
-    },
-    "enter-nonce": {
-      "form": {
-        "description": "Öffne Dein E-Mail Postfach und gib den Code ein, den wir geschickt haben.",
-        "next": "Weiter",
-        "nonce": "Code eingeben",
-        "validations": {
-          "length": "muss genau 6 Buchstaben lang sein"
-        }
-      }
-    },
     "password-reset": {
       "change-password": {
         "error": "Passwort Änderung fehlgeschlagen. Möglicherweise falscher Sicherheitscode?",
@@ -176,7 +146,13 @@
         "title": "Benutzerkonto anlegen"
       },
       "email": {
+        "buttonTitle": {
+          "resend": "Erneut senden",
+          "send": "Sende E-Mail",
+          "skipResend": "Nicht senden"
+        },
         "form": {
+          "sendEmailAgain": "E-Mail erneut senden",
           "success": "Verifikations-E-Mail gesendet an <b>{email}</b>!"
         },
         "title": "E-Mail"
@@ -189,14 +165,26 @@
       "email-nonce": {
         "buttonTitle": "Bestätigen",
         "form": {
-          "success": "Gültiger Bestätigungs-Code <b>{nonce}</b> für E-Mail <b>{email}</b>!"
+          "description": "Öffne Dein E-Mail Postfach und gib den Code ein, den wir geschickt haben.",
+          "next": "Weiter",
+          "nonce": "E-Mail-Code: 32143",
+          "success": "Gültiger Bestätigungs-Code <b>{nonce}</b> für E-Mail <b>{email}</b>!",
+          "validations": {
+            "length": "muss genau 5 Buchstaben lang sein"
+          }
         },
         "title": "E-Mail Bestätigung"
       },
       "invite-code": {
         "buttonTitle": "Weiter",
         "form": {
-          "success": "Gültiger Einladungs-Code <b>{inviteCode}</b>!"
+          "description": "Gib den Einladungs-Code ein, den du bekommen hast.",
+          "invite-code": "Einladungs-Code: ACJERB",
+          "next": "Weiter",
+          "success": "Gültiger Einladungs-Code <b>{inviteCode}</b>!",
+          "validations": {
+            "length": "muss genau 6 Buchstaben lang sein"
+          }
         },
         "title": "Einladung"
       },
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index bee29c349..bb620993a 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -120,36 +120,6 @@
     "versus": "Versus"
   },
   "components": {
-    "email": {
-      "buttonTitle": {
-        "resend": "Resend e-mail",
-        "send": "Send e-mail",
-        "skipResend": "Skip resend"
-      },
-      "form": {
-        "sendEmailAgain": "Send e-mail again"
-      }
-    },
-    "enter-invite": {
-      "form": {
-        "description": "Enter the invitation code you received.",
-        "invite-code": "Enter your invite code",
-        "next": "Continue",
-        "validations": {
-          "length": "must be 6 characters long"
-        }
-      }
-    },
-    "enter-nonce": {
-      "form": {
-        "description": "Open your inbox and enter the code that we've sent to you.",
-        "next": "Continue",
-        "nonce": "Enter your code",
-        "validations": {
-          "length": "must be 6 characters long"
-        }
-      }
-    },
     "password-reset": {
       "change-password": {
         "error": "Changing your password failed. Maybe the security code was not correct?",
@@ -176,7 +146,13 @@
         "title": "Create user account"
       },
       "email": {
+        "buttonTitle": {
+          "resend": "Resend e-mail",
+          "send": "Send e-mail",
+          "skipResend": "Skip resend"
+        },
         "form": {
+          "sendEmailAgain": "Send e-mail again",
           "success": "Verification e-mail send to <b>{email}</b>!"
         },
         "title": "E-Mail"
@@ -189,14 +165,26 @@
       "email-nonce": {
         "buttonTitle": "Confirm",
         "form": {
-          "success": "Valid verification code <b>{nonce}</b> for e-mail <b>{email}</b>!"
+          "description": "Open your inbox and enter the code that we've sent to you.",
+          "next": "Continue",
+          "nonce": "E-mail code: 32143",
+          "success": "Valid verification code <b>{nonce}</b> for e-mail <b>{email}</b>!",
+          "validations": {
+            "length": "must be 5 characters long"
+          }
         },
         "title": "E-Mail Confirmation"
       },
       "invite-code": {
         "buttonTitle": "Next",
         "form": {
-          "success": "Valid invite code <b>{inviteCode}</b>!"
+          "description": "Enter the invitation code you received.",
+          "invite-code": "Invite code: ACJERB",
+          "next": "Continue",
+          "success": "Valid invite code <b>{inviteCode}</b>!",
+          "validations": {
+            "length": "must be 6 characters long"
+          }
         },
         "title": "Invitation"
       },