diff --git a/legalconsenthub/app/components/FormStepperWithNavigation.vue b/legalconsenthub/app/components/FormStepperWithNavigation.vue
index 2727165..c6bbb89 100644
--- a/legalconsenthub/app/components/FormStepperWithNavigation.vue
+++ b/legalconsenthub/app/components/FormStepperWithNavigation.vue
@@ -51,21 +51,25 @@
         {{ $t('applicationForms.navigation.previous') }}
       </UButton>
 
-      <UButton
-        v-if="stepper?.hasNext"
-        trailing-icon="i-lucide-arrow-right"
-        :disabled="!stepper?.hasNext"
-        size="lg"
-        @click="handleNavigate('forward')"
-      >
-        {{ $t('applicationForms.navigation.next') }}
-      </UButton>
-
-      <div v-if="!stepper?.hasNext" class="flex flex-wrap items-center gap-1.5">
+      <div class="flex flex-wrap items-center gap-1.5">
         <UButton trailing-icon="i-lucide-save" :disabled="disabled" variant="outline" size="lg" @click="emit('save')">
           {{ $t('applicationForms.navigation.save') }}
         </UButton>
-        <UButton trailing-icon="i-lucide-send-horizontal" :disabled="disabled" size="lg" @click="emit('submit')">
+        <UButton
+          v-if="stepper?.hasNext"
+          trailing-icon="i-lucide-arrow-right"
+          size="lg"
+          @click="handleNavigate('forward')"
+        >
+          {{ $t('applicationForms.navigation.next') }}
+        </UButton>
+        <UButton
+          v-if="!stepper?.hasNext"
+          trailing-icon="i-lucide-send-horizontal"
+          :disabled="disabled"
+          size="lg"
+          @click="emit('submit')"
+        >
           {{ $t('applicationForms.navigation.submit') }}
         </UButton>
       </div>
diff --git a/legalconsenthub/i18n/locales/de.json b/legalconsenthub/i18n/locales/de.json
index 050acdc..1fcc2b6 100644
--- a/legalconsenthub/i18n/locales/de.json
+++ b/legalconsenthub/i18n/locales/de.json
@@ -173,7 +173,7 @@
   "auth": {
     "welcome": "Willkommen",
     "redirectMessage": "Sie werden zur Authentifizierung zu Keycloak weitergeleitet",
-    "signIn": "Mit Keycloak anmelden",
+    "signIn": "Anmelden",
     "termsAgreement": "Mit der Anmeldung stimmen Sie unseren Nutzungsbedingungen zu",
     "login": "Anmelden",
     "redirecting": "Sie werden weitergeleitet"
diff --git a/legalconsenthub/i18n/locales/en.json b/legalconsenthub/i18n/locales/en.json
index 17897c5..dfbbb70 100644
--- a/legalconsenthub/i18n/locales/en.json
+++ b/legalconsenthub/i18n/locales/en.json
@@ -173,7 +173,7 @@
   "auth": {
     "welcome": "Welcome",
     "redirectMessage": "You will be redirected to Keycloak to authenticate",
-    "signIn": "Sign in with Keycloak",
+    "signIn": "Sign in",
     "termsAgreement": "By signing in, you agree to our terms of service",
     "login": "Login",
     "redirecting": "You are being redirected"