diff --git a/client/src/pages/onboarding/AccountSetup.vue b/client/src/pages/onboarding/AccountSetup.vue
index c68dfade..eeba2b7c 100644
--- a/client/src/pages/onboarding/AccountSetup.vue
+++ b/client/src/pages/onboarding/AccountSetup.vue
@@ -32,7 +32,6 @@ const user = useUserStore();
           getLoginURL({
             course: props.courseType,
             lang: user.language,
-            next: `/onboarding/${courseType}/account/confirm`,
           })
         "
         class="btn-secondary"
diff --git a/client/src/pages/onboarding/WizardBase.vue b/client/src/pages/onboarding/WizardBase.vue
index 642e6daf..82116103 100644
--- a/client/src/pages/onboarding/WizardBase.vue
+++ b/client/src/pages/onboarding/WizardBase.vue
@@ -5,7 +5,7 @@ import mood_uk from "@/assets/images/mood_uk.jpg";
 import mood_vv from "@/assets/images/mood_vv.jpg";
 import { useTranslation } from "i18next-vue";
 import { startsWith } from "lodash";
-import { getVVCourseName } from "@/pages/onboarding/vv/helpers";
+import { getVVCourseName } from "@/pages/onboarding/vv/composables";
 
 const props = defineProps({
   courseType: {
diff --git a/client/src/pages/onboarding/vv/CheckoutAddress.vue b/client/src/pages/onboarding/vv/CheckoutAddress.vue
index b677a52a..d9a36d51 100644
--- a/client/src/pages/onboarding/vv/CheckoutAddress.vue
+++ b/client/src/pages/onboarding/vv/CheckoutAddress.vue
@@ -10,7 +10,7 @@ import { useEntities } from "@/services/onboarding";
 import { useDebounceFn, useFetch } from "@vueuse/core";
 import { useRoute } from "vue-router";
 import { useTranslation } from "i18next-vue";
-import { getVVCourseName } from "./helpers";
+import { getVVCourseName } from "./composables";
 
 type BillingAddressType = {
   first_name: string;
diff --git a/client/src/pages/onboarding/vv/helpers.ts b/client/src/pages/onboarding/vv/composables.ts
similarity index 53%
rename from client/src/pages/onboarding/vv/helpers.ts
rename to client/src/pages/onboarding/vv/composables.ts
index 2dccab98..efc38658 100644
--- a/client/src/pages/onboarding/vv/helpers.ts
+++ b/client/src/pages/onboarding/vv/composables.ts
@@ -1,16 +1,18 @@
-import i18next from "i18next";
+import { useTranslation } from "i18next-vue";
 
 export const getVVCourseName = (courseType: string) => {
+  const { t } = useTranslation();
+
   if (!["vv-de", "vv-it", "vv-fr"].includes(courseType)) {
     return "";
   }
 
   const lookup: { [key: string]: string } = {
-    "vv-de": i18next.t("a.Deutsch"),
-    "vv-fr": i18next.t("a.Franzosisch"),
-    "vv-it": i18next.t("a.Italienisch"),
+    "vv-de": "Deutsch",
+    "vv-fr": "Français",
+    "vv-it": "Italiano",
   };
 
-  const vv = i18next.t("a.Versicherungsvermittler/-in");
+  const vv = t("a.Versicherungsvermittler/-in");
   return `${vv} (${lookup[courseType]})`;
 };