diff --git a/apps/api/src/server.ts b/apps/api/src/server.ts
index 35f7a75e..d62261e5 100644
--- a/apps/api/src/server.ts
+++ b/apps/api/src/server.ts
@@ -23,7 +23,7 @@ app.use(
   helmet({
     contentSecurityPolicy: {
       directives: {
-        'img-src': ["'self'", '*.githubusercontent.com'],
+        'img-src': ["'self'", '*.githubusercontent.com', 'data', 'dlrgbrahmseedigitalprod.blob.core.windows.net'],
       },
     },
   })
@@ -45,7 +45,7 @@ app.use(
       transport: 'session',
     },
     dlrg: {
-      dynamic: ['mode'],
+      dynamic: ['mode', 'origin'],
       transport: 'session',
       oauth: 2,
       response: ['token', 'profile'],
diff --git a/apps/frontend/src/components/BasicInputs/BasicDatepicker.vue b/apps/frontend/src/components/BasicInputs/BasicDatepicker.vue
index 00cbe00c..3965196d 100644
--- a/apps/frontend/src/components/BasicInputs/BasicDatepicker.vue
+++ b/apps/frontend/src/components/BasicInputs/BasicDatepicker.vue
@@ -52,13 +52,13 @@ const props = withDefaults(
     multiCalendars: false,
     flow: undefined,
     utc: false,
-    timezone: undefined,
+    timezone: 'Europe/Berlin',
     presetRanges: undefined,
     markers: undefined,
     autoApply: true,
     icon: undefined,
-    textInput: true,
-    format: 'dd.MM.yyyy HH:mm',
+    textInput: false,
+    format: 'dd.MM.yyyy',
     modelType: undefined,
   }
 )
@@ -109,6 +109,7 @@ const { model, errorMessage } = useValidationModel(props, emit)
         :required="required"
         :min-date="disabledDates?.to"
         :max-date="disabledDates?.from"
+        locale="de"
       />
     </BasicFormGroup>
   </div>
diff --git a/apps/frontend/src/components/forms/ort/FormOrtGeneral.vue b/apps/frontend/src/components/forms/ort/FormOrtGeneral.vue
index 433744d4..c079140f 100644
--- a/apps/frontend/src/components/forms/ort/FormOrtGeneral.vue
+++ b/apps/frontend/src/components/forms/ort/FormOrtGeneral.vue
@@ -137,7 +137,7 @@ const handle = async (event: Event) => {
         street-label="Straße"
         house-number-label="Hausnummer"
         autocomplete-label="Intelligente Suche"
-        manual-entry-label="Manuell eingeben"
+        manual-entry-label="Adresse nicht gefunden? Manuell eingeben"
         :address-find="addressFind"
         :country-formatter="(country) => country.name"
         :country="addressForm.country"
diff --git a/apps/frontend/src/components/forms/person/FormPersonGeneral.vue b/apps/frontend/src/components/forms/person/FormPersonGeneral.vue
index 6a278165..18285105 100644
--- a/apps/frontend/src/components/forms/person/FormPersonGeneral.vue
+++ b/apps/frontend/src/components/forms/person/FormPersonGeneral.vue
@@ -152,7 +152,7 @@ const submit = () => {
         street-label="Straße"
         house-number-label="Hausnummer"
         autocomplete-label="Intelligente Suche"
-        manual-entry-label="Manuell eingeben"
+        manual-entry-label="Adresse nicht gefunden? Manuell eingeben"
         :address-find="addressFind"
         :country-formatter="(country) => country.name"
         :country="addressForm.country"
diff --git a/apps/frontend/src/views/Anmeldung/components/PublicHero.vue b/apps/frontend/src/views/Anmeldung/components/PublicHero.vue
index aceb5b59..8cd95ec2 100644
--- a/apps/frontend/src/views/Anmeldung/components/PublicHero.vue
+++ b/apps/frontend/src/views/Anmeldung/components/PublicHero.vue
@@ -72,72 +72,72 @@ const unterveranstaltung = injectUnterveranstaltung()
         "
       />
     </div>
-    <div class="overflow-hidden">
-      <div class="mx-auto max-w-7xl px-6 pb-32 pt-36 sm:pt-60 lg:px-8 lg:pt-32">
-        <div class="mx-auto max-w-2xl gap-x-14 lg:mx-0 lg:flex lg:max-w-none lg:items-center">
-          <div class="relative w-full lg:max-w-xl lg:shrink-0 xl:max-w-2xl">
-            <div class="inline-flex space-x-6">
-              <span
-                v-if="unterveranstaltung?.veranstaltung?.beginn"
-                class="rounded-full bg-primary-600/10 px-3 py-1 text-sm/6 font-semibold text-primary-600 ring-1 ring-primary-600/10 ring-inset"
-                >{{ formatDate(unterveranstaltung?.veranstaltung.beginn, 'DD.MM') }}
-                <span v-if="unterveranstaltung?.veranstaltung?.ende"
-                  >- {{ formatDate(unterveranstaltung?.veranstaltung?.ende, 'DD.MM.YY') }}</span
-                ></span
-              >
-              <span
-                v-if="unterveranstaltung?.meldeschluss"
-                class="inline-flex items-center space-x-2 text-sm/6 text-gray-600"
-              >
-                <span>Meldeschluss am {{ formatDate(unterveranstaltung?.meldeschluss, 'DD.MM.YY') }}</span>
-              </span>
-            </div>
-            <h1 class="mt-10 text-pretty text-5xl tracking-tight text-gray-900 sm:text-7xl">
-              {{ unterveranstaltung?.landingSettings?.heroTitle }}
-            </h1>
-            <p class="mt-8 text-pretty text-lg font-medium text-gray-500 sm:max-w-md sm:text-xl/8 lg:max-w-none">
-              {{ unterveranstaltung?.landingSettings?.heroSubtitle }}
-            </p>
-            <div class="mt-10 flex items-center gap-x-6">
-              <RouterLink
-                v-if="
-                  unterveranstaltung?.meldeschluss > new Date() &&
-                  unterveranstaltung?.maxTeilnehmende - unterveranstaltung?._count.Anmeldung > 0
-                "
-                class="rounded-md bg-primary-600 px-3.5 py-2.5 text font-semibold text-white shadow-sm hover:bg-primary-700 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600"
-                :to="{ name: 'Public Anmeldung' }"
-              >
-                Anmelden <span aria-hidden="true">&rarr;</span>
-              </RouterLink>
-              <span
-                v-else
-                class="rounded-md bg-gray-200 px-3.5 py-2.5 text text-gray-800 shadow-sm"
-              >
-                Meldeschluss erreicht
-              </span>
-            </div>
+  </div>
+  <div class="overflow-hidden">
+    <div class="mx-auto max-w-7xl px-6 pb-32 pt-36 sm:pt-60 lg:px-8 lg:pt-32">
+      <div class="mx-auto max-w-2xl gap-x-14 lg:mx-0 lg:flex lg:max-w-none lg:items-center">
+        <div class="relative w-full lg:max-w-xl lg:shrink-0 xl:max-w-2xl">
+          <div class="inline-flex space-x-6">
+            <span
+              v-if="unterveranstaltung?.veranstaltung?.beginn"
+              class="rounded-full bg-primary-600/10 px-3 py-1 text-sm/6 font-semibold text-primary-600 ring-1 ring-primary-600/10 ring-inset"
+              >{{ formatDate(unterveranstaltung?.veranstaltung.beginn, 'DD.MM') }}
+              <span v-if="unterveranstaltung?.veranstaltung?.ende"
+                >- {{ formatDate(unterveranstaltung?.veranstaltung?.ende, 'DD.MM.YY') }}</span
+              ></span
+            >
+            <span
+              v-if="unterveranstaltung?.meldeschluss"
+              class="inline-flex items-center space-x-2 text-sm/6 text-gray-600"
+            >
+              <span>Meldeschluss am {{ formatDate(unterveranstaltung?.meldeschluss, 'DD.MM.YY') }}</span>
+            </span>
+          </div>
+          <h1 class="mt-10 text-pretty text-5xl tracking-tight text-gray-900 sm:text-7xl">
+            {{ unterveranstaltung?.landingSettings?.heroTitle }}
+          </h1>
+          <p class="mt-8 text-pretty text-lg font-medium text-gray-500 sm:max-w-md sm:text-xl/8 lg:max-w-none">
+            {{ unterveranstaltung?.landingSettings?.heroSubtitle }}
+          </p>
+          <div class="mt-10 flex items-center gap-x-6">
+            <RouterLink
+              v-if="
+                unterveranstaltung?.meldeschluss > new Date() &&
+                unterveranstaltung?.maxTeilnehmende - unterveranstaltung?._count.Anmeldung > 0
+              "
+              class="rounded-md bg-primary-600 px-3.5 py-2.5 text font-semibold text-white shadow-sm hover:bg-primary-700 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600"
+              :to="{ name: 'Public Anmeldung' }"
+            >
+              Anmelden <span aria-hidden="true">&rarr;</span>
+            </RouterLink>
+            <span
+              v-else
+              class="rounded-md bg-gray-200 px-3.5 py-2.5 text text-gray-800 shadow-sm"
+            >
+              Meldeschluss erreicht
+            </span>
           </div>
-          <div class="pt-16 lg:row-span-2 lg:-mr-16 xl:mr-auto">
-            <div class="-mx-8 grid grid-cols-2 gap-4 sm:-mx-16 sm:grid-cols-4 lg:mx-0 lg:grid-cols-2 lg:gap-4 xl:gap-8">
-              <template
-                v-for="(image, index) in unterveranstaltung?.heroImages"
-                :key="image.id"
+        </div>
+        <div class="pt-16 lg:row-span-2 lg:-mr-16 xl:mr-auto">
+          <div class="-mx-8 grid grid-cols-2 gap-4 sm:-mx-16 sm:grid-cols-4 lg:mx-0 lg:grid-cols-2 lg:gap-4 xl:gap-8">
+            <template
+              v-for="(image, index) in unterveranstaltung?.heroImages"
+              :key="image.id"
+            >
+              <div
+                :class="
+                  index % 2 === 0
+                    ? 'aspect-square overflow-hidden rounded-xl shadow-xl'
+                    : '-mt-8 aspect-square overflow-hidden rounded-xl shadow-xl lg:-mt-40'
+                "
               >
-                <div
-                  :class="
-                    index % 2 === 0
-                      ? 'aspect-square overflow-hidden rounded-xl shadow-xl'
-                      : '-mt-8 aspect-square overflow-hidden rounded-xl shadow-xl lg:-mt-40'
-                  "
-                >
-                  <img
-                    :key="image.id"
-                    :src="image.url"
-                    class="block size-full object-cover"
-                  />
-                </div>
-              </template>
-            </div>
+                <img
+                  :key="image.id"
+                  :src="image.url"
+                  class="block size-full object-cover"
+                />
+              </div>
+            </template>
           </div>
         </div>
       </div>
diff --git a/apps/frontend/src/views/Login/Login.vue b/apps/frontend/src/views/Login/Login.vue
index 7d20105f..fda98fda 100644
--- a/apps/frontend/src/views/Login/Login.vue
+++ b/apps/frontend/src/views/Login/Login.vue
@@ -50,6 +50,9 @@ const formatLoginError = computed(() => {
 })
 
 const version = `${import.meta.env.VITE_APP_VERSION || 'unknown'}-${import.meta.env.VITE_APP_COMMIT_HASH || 'unknown'}`
+
+const origin = `${location.href}/api`
+const oauthHref = `/api/connect/dlrg?mode=login&origin=${encodeURIComponent(origin)}`
 </script>
 
 <template>
@@ -136,7 +139,7 @@ const version = `${import.meta.env.VITE_APP_VERSION || 'unknown'}-${import.meta.
 
           <div class="mt-6">
             <a
-              href="/api/connect/dlrg?mode=login"
+              :href="oauthHref"
               class="flex w-full items-center justify-center gap-3 rounded-md bg-[#e30613] px-3 py-2 text-sm font-semibold hover:bg-[#CA0511] focus-visible:ring-transparent"
             >
               <svg
diff --git a/apps/frontend/src/views/Registrierung/GliederungRegistrierung.vue b/apps/frontend/src/views/Registrierung/GliederungRegistrierung.vue
index 1cb91780..058f65e4 100644
--- a/apps/frontend/src/views/Registrierung/GliederungRegistrierung.vue
+++ b/apps/frontend/src/views/Registrierung/GliederungRegistrierung.vue
@@ -69,7 +69,10 @@ async function registerGliederung() {
     if (oauthRegistration.value) {
       // first optain jwt containing the oauth sub id
       // open new tab with oauth login
-      window.open('/api/connect/dlrg?mode=register', '_blank')
+
+      const origin = `${location.href}/api`
+      const oauthHref = `/api/connect/dlrg?mode=register&origin=${encodeURIComponent(origin)}`
+      window.open(oauthHref, '_blank')
 
       accountData.jwtOAuthToken = await watiForOAuth()
       accountData.password = undefined
diff --git a/package.json b/package.json
index e6a5f2ee..40ac46ed 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "codeanker-project",
   "author": "CODEANKER GmbH",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "",
   "license": "CC-BY-3.0-DE",
   "workspaces": [