diff --git a/client/src/components/onboarding/OrganisationAddress.vue b/client/src/components/onboarding/OrganisationAddress.vue
index b8b59889..e56e33cd 100644
--- a/client/src/components/onboarding/OrganisationAddress.vue
+++ b/client/src/components/onboarding/OrganisationAddress.vue
@@ -34,7 +34,7 @@ const orgAddress = computed({
         for="company-name"
         class="block text-sm font-medium leading-6 text-gray-900"
       >
-        {{ $t("a.Name") }}
+        {{ $t("a.Firmenname") }}
       </label>
       <div class="mt-2">
         <input
diff --git a/client/src/consts.ts b/client/src/consts.ts
new file mode 100644
index 00000000..25801247
--- /dev/null
+++ b/client/src/consts.ts
@@ -0,0 +1,19 @@
+// Course IDs
+export const COURSE_TEST_ID = -1;
+export const COURSE_UK = -3;
+export const COURSE_VERSICHERUNGSVERMITTLERIN_ID = -4;
+export const COURSE_UK_FR = -5;
+export const COURSE_UK_TRAINING = -6;
+export const COURSE_UK_TRAINING_FR = -7;
+export const COURSE_UK_IT = -8;
+export const COURSE_UK_TRAINING_IT = -9;
+export const COURSE_VERSICHERUNGSVERMITTLERIN_FR_ID = -10;
+export const COURSE_VERSICHERUNGSVERMITTLERIN_IT_ID = -11;
+export const COURSE_VERSICHERUNGSVERMITTLERIN_PRUEFUNG_ID = -12;
+export const COURSE_MOTORFAHRZEUG_PRUEFUNG_ID = -13;
+
+// Organization IDs
+export const ORGANISATION_OTHER_BROKER_ID = 1;
+export const ORGANISATION_OTHER_HEALTH_INSURANCE_ID = 2;
+export const ORGANISATION_OTHER_PRIVATE_INSURANCE_ID = 3;
+export const ORGANISATION_NO_COMPANY_ID = 31;
\ No newline at end of file
diff --git a/client/src/pages/onboarding/AccountProfile.vue b/client/src/pages/onboarding/AccountProfile.vue
index 4a0d780b..2982a9a3 100644
--- a/client/src/pages/onboarding/AccountProfile.vue
+++ b/client/src/pages/onboarding/AccountProfile.vue
@@ -3,9 +3,9 @@ import WizardPage from "@/components/onboarding/WizardPage.vue";
 import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
 import { computed, ref, watch } from "vue";
 import { useUserStore } from "@/stores/user";
-import { useRoute } from "vue-router";
+import { useRoute, useRouter } from "vue-router";
 import { useTranslation } from "i18next-vue";
-import { profileNextRoute } from "@/services/onboarding";
+import { isOtherOrganisation, profileNextRoute } from "@/services/onboarding";
 import { useEntities } from "@/services/entities";
 import AvatarImage from "@/components/ui/AvatarImage.vue";
 
@@ -13,9 +13,12 @@ const { t } = useTranslation();
 
 const user = useUserStore();
 const route = useRoute();
+const router = useRouter();
 
 const { organisations } = useEntities();
 
+const organisationDetailName = ref<string>("");
+
 const selectedOrganisation = ref({
   id: 0,
   name: t("a.Auswählen"),
@@ -35,7 +38,11 @@ watch(
 );
 
 const validOrganisation = computed(() => {
-  return selectedOrganisation.value.id !== 0;
+  const organisationSelected = selectedOrganisation.value.id !== 0;
+  const organisationNameSet =
+    !isOtherOrganisation(selectedOrganisation.value.id) ||
+    !!organisationDetailName.value.trim();
+  return organisationSelected && organisationNameSet;
 });
 
 const avatarError = ref(false);
@@ -56,15 +63,21 @@ async function avatarUpload(e: Event) {
   }
 }
 
-watch(selectedOrganisation, async (organisation) => {
+async function updateUserProfile() {
   await user.updateUserProfile({
-    organisation: organisation.id,
+    organisation: selectedOrganisation.value.id,
+    organisation_detail_name: organisationDetailName.value.trim(),
   });
-});
+}
 
 const nextRoute = computed(() => {
   return profileNextRoute(route.params.courseType);
 });
+
+async function navigateNextRoute() {
+  await updateUserProfile();
+  await router.push({ name: nextRoute.value });
+}
 </script>
 
 <template>
@@ -86,6 +99,19 @@ const nextRoute = computed(() => {
 
       <ItDropdownSelect v-model="selectedOrganisation" :items="organisations" />
 
+      <div v-if="isOtherOrganisation(selectedOrganisation.id)" class="my-8">
+        <label for="organisationDetailName" class="block pb-1.5 heading-3">
+          {{ $t("a.Firmenname") }}
+        </label>
+        <input
+          id="organisationDetailName"
+          v-model="organisationDetailName"
+          type="text"
+          name="phone"
+          class="block w-full border-0 py-1.5 text-gray-900 ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-blue-600 disabled:cursor-not-allowed disabled:text-gray-500 disabled:ring-gray-200 sm:max-w-sm sm:text-sm sm:leading-6"
+        />
+      </div>
+
       <div class="mt-16 flex flex-col justify-between gap-12 lg:flex-row lg:gap-24">
         <div>
           <h3 class="mb-3">{{ $t("a.Profilbild") }}</h3>
@@ -117,18 +143,16 @@ const nextRoute = computed(() => {
     </template>
 
     <template #footer>
-      <router-link v-slot="{ navigate }" :to="{ name: nextRoute }" custom>
-        <button
-          :disabled="!validOrganisation"
-          class="btn-blue flex items-center"
-          role="link"
-          data-cy="continue-button"
-          @click="navigate"
-        >
-          {{ $t("general.next") }}
-          <it-icon-arrow-right class="it-icon ml-2 h-6 w-6" />
-        </button>
-      </router-link>
+      <button
+        :disabled="!validOrganisation"
+        class="btn-blue flex items-center"
+        role="link"
+        data-cy="continue-button"
+        @click="navigateNextRoute"
+      >
+        {{ $t("general.next") }}
+        <it-icon-arrow-right class="it-icon ml-2 h-6 w-6" />
+      </button>
     </template>
   </WizardPage>
 </template>
diff --git a/client/src/pages/onboarding/vv/CheckoutAddress.vue b/client/src/pages/onboarding/vv/CheckoutAddress.vue
index f8ff17ef..76e5a6ed 100644
--- a/client/src/pages/onboarding/vv/CheckoutAddress.vue
+++ b/client/src/pages/onboarding/vv/CheckoutAddress.vue
@@ -13,6 +13,12 @@ import DatatransCembraDeviceFingerprint from "@/components/onboarding/DatatransC
 import { getLocalSessionKey } from "@/statistics";
 import log from "loglevel";
 import { normalizeSwissPhoneNumber, validatePhoneNumber } from "@/utils/phone";
+import {
+  ORGANISATION_NO_COMPANY_ID,
+  ORGANISATION_OTHER_BROKER_ID,
+  ORGANISATION_OTHER_HEALTH_INSURANCE_ID,
+  ORGANISATION_OTHER_PRIVATE_INSURANCE_ID,
+} from "@/consts";
 
 const props = defineProps({
   courseType: {
@@ -31,11 +37,14 @@ const userOrganisationName = computed(() => {
   }
 
   // Those IDs do not represent a company
-  // 1: Other broker
-  // 2: Other insurance
-  // 3: Other private insurance
-  // 31: No company relation
-  if ([1, 2, 3, 31].includes(user.organisation)) {
+  if (
+    [
+      ORGANISATION_OTHER_BROKER_ID,
+      ORGANISATION_OTHER_HEALTH_INSURANCE_ID,
+      ORGANISATION_OTHER_PRIVATE_INSURANCE_ID,
+      ORGANISATION_NO_COMPANY_ID,
+    ].includes(user.organisation)
+  ) {
     return null;
   }
 
diff --git a/client/src/services/onboarding.ts b/client/src/services/onboarding.ts
index 24b59a48..9c59ef48 100644
--- a/client/src/services/onboarding.ts
+++ b/client/src/services/onboarding.ts
@@ -1,4 +1,9 @@
 import { isString, startsWith } from "lodash";
+import {
+  ORGANISATION_OTHER_BROKER_ID,
+  ORGANISATION_OTHER_HEALTH_INSURANCE_ID,
+  ORGANISATION_OTHER_PRIVATE_INSURANCE_ID,
+} from "@/consts";
 
 export function profileNextRoute(courseType: string | string[]) {
   if (courseType === "uk") {
@@ -10,3 +15,11 @@ export function profileNextRoute(courseType: string | string[]) {
   }
   return "";
 }
+
+export function isOtherOrganisation(orgId: number) {
+  return [
+    ORGANISATION_OTHER_BROKER_ID,
+    ORGANISATION_OTHER_HEALTH_INSURANCE_ID,
+    ORGANISATION_OTHER_PRIVATE_INSURANCE_ID,
+  ].includes(orgId);
+}
diff --git a/server/vbv_lernwelt/course/consts.py b/server/vbv_lernwelt/course/consts.py
index a0dd7b27..a9949458 100644
--- a/server/vbv_lernwelt/course/consts.py
+++ b/server/vbv_lernwelt/course/consts.py
@@ -28,3 +28,10 @@ UK_COURSE_IDS = [
     COURSE_UK_TRAINING_FR,
     COURSE_UK_TRAINING_IT,
 ]
+
+
+# Organization IDs
+ORGANISATION_OTHER_BROKER_ID = 1
+ORGANISATION_OTHER_HEALTH_INSURANCE_ID = 2
+ORGANISATION_OTHER_PRIVATE_INSURANCE_ID = 3
+ORGANISATION_NO_COMPANY_ID = 31