diff --git a/lib/mv_web/live/auth/link_oidc_account_live.ex b/lib/mv_web/live/auth/link_oidc_account_live.ex
index 05faf67..2262723 100644
--- a/lib/mv_web/live/auth/link_oidc_account_live.ex
+++ b/lib/mv_web/live/auth/link_oidc_account_live.ex
@@ -232,64 +232,61 @@ defmodule MvWeb.LinkOidcAccountLive do
     ~H"""
     <div class="mx-auto max-w-sm mt-16">
       <%!-- Language Selector --%>
-      <nav aria-label={dgettext("auth", "Language selection")} class="flex justify-center mb-4">
+      <div class="flex justify-center mb-4">
         <form method="post" action="/set_locale" class="text-sm">
           <input type="hidden" name="_csrf_token" value={Plug.CSRFProtection.get_csrf_token()} />
           <select
             name="locale"
             onchange="this.form.submit()"
             class="select select-sm select-bordered"
-            aria-label={dgettext("auth", "Select language")}
           >
             <option value="de" selected={Gettext.get_locale() == "de"}>🇩🇪 Deutsch</option>
             <option value="en" selected={Gettext.get_locale() == "en"}>🇬🇧 English</option>
           </select>
         </form>
-      </nav>
+      </div>
 
-      <main>
-        <.header class="text-center">
-          {dgettext("auth", "Link OIDC Account")}
-          <:subtitle>
-            {dgettext(
-              "auth",
-              "An account with email %{email} already exists. Please enter your password to link your OIDC account.",
-              email: @user.email
-            )}
-          </:subtitle>
-        </.header>
+      <.header class="text-center">
+        {dgettext("auth", "Link OIDC Account")}
+        <:subtitle>
+          {dgettext(
+            "auth",
+            "An account with email %{email} already exists. Please enter your password to link your OIDC account.",
+            email: @user.email
+          )}
+        </:subtitle>
+      </.header>
 
-        <.form for={@form} id="link-oidc-form" phx-submit="submit" phx-change="validate" class="mt-8">
-          <div class="space-y-6">
-            <div>
-              <.input
-                field={@form[:password]}
-                type="password"
-                label={dgettext("auth", "Password")}
-                required
-              />
-            </div>
-
-            <%= if @error do %>
-              <div class="rounded-md bg-red-50 p-4">
-                <p class="text-sm text-red-800">{@error}</p>
-              </div>
-            <% end %>
-
-            <div>
-              <.button phx-disable-with={dgettext("auth", "Linking...")} class="w-full">
-                {dgettext("auth", "Link Account")}
-              </.button>
-            </div>
+      <.form for={@form} id="link-oidc-form" phx-submit="submit" phx-change="validate" class="mt-8">
+        <div class="space-y-6">
+          <div>
+            <.input
+              field={@form[:password]}
+              type="password"
+              label={dgettext("auth", "Password")}
+              required
+            />
           </div>
-        </.form>
 
-        <div class="mt-4 text-center text-sm">
-          <.link navigate={~p"/sign-in"} class="text-brand hover:underline">
-            {dgettext("auth", "Cancel")}
-          </.link>
+          <%= if @error do %>
+            <div class="rounded-md bg-red-50 p-4">
+              <p class="text-sm text-red-800">{@error}</p>
+            </div>
+          <% end %>
+
+          <div>
+            <.button phx-disable-with={dgettext("auth", "Linking...")} class="w-full">
+              {dgettext("auth", "Link Account")}
+            </.button>
+          </div>
         </div>
-      </main>
+      </.form>
+
+      <div class="mt-4 text-center text-sm">
+        <.link navigate={~p"/sign-in"} class="text-brand hover:underline">
+          {dgettext("auth", "Cancel")}
+        </.link>
+      </div>
     </div>
     """
   end
diff --git a/mix.exs b/mix.exs
index b215d59..86b1010 100644
--- a/mix.exs
+++ b/mix.exs
@@ -22,7 +22,7 @@ defmodule Mv.MixProject do
   def application do
     [
       mod: {Mv.Application, []},
-      extra_applications: [:logger, :runtime_tools, :gettext]
+      extra_applications: [:logger, :runtime_tools]
     ]
   end
 
diff --git a/priv/gettext/auth.pot b/priv/gettext/auth.pot
index ebb8d3c..5d3f8db 100644
--- a/priv/gettext/auth.pot
+++ b/priv/gettext/auth.pot
@@ -36,7 +36,7 @@ msgstr ""
 msgid "Need an account?"
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:268
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:266
 #, elixir-autogen
 msgid "Password"
 msgstr ""
@@ -65,12 +65,12 @@ msgstr ""
 msgid "Your password has successfully been reset"
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:254
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:252
 #, elixir-autogen, elixir-format
 msgid "An account with email %{email} already exists. Please enter your password to link your OIDC account."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:289
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:287
 #, elixir-autogen, elixir-format
 msgid "Cancel"
 msgstr ""
@@ -85,17 +85,17 @@ msgstr ""
 msgid "Invalid session. Please try again."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:281
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:279
 #, elixir-autogen, elixir-format
 msgid "Link Account"
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:252
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:250
 #, elixir-autogen, elixir-format
 msgid "Link OIDC Account"
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:280
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:278
 #, elixir-autogen, elixir-format
 msgid "Linking..."
 msgstr ""
@@ -130,13 +130,3 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "This OIDC account is already linked to another user. Please contact support."
 msgstr ""
-
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:235
-#, elixir-autogen, elixir-format
-msgid "Language selection"
-msgstr ""
-
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:242
-#, elixir-autogen, elixir-format
-msgid "Select language"
-msgstr ""
diff --git a/priv/gettext/de/LC_MESSAGES/auth.po b/priv/gettext/de/LC_MESSAGES/auth.po
index f0cbdf3..7966aa1 100644
--- a/priv/gettext/de/LC_MESSAGES/auth.po
+++ b/priv/gettext/de/LC_MESSAGES/auth.po
@@ -35,7 +35,7 @@ msgstr "Falls diese*r Benutzer*in bekannt ist, wird jetzt eine Email mit einer A
 msgid "Need an account?"
 msgstr "Konto anlegen?"
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:268
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:266
 #, elixir-autogen
 msgid "Password"
 msgstr "Passwort"
@@ -64,12 +64,12 @@ msgstr "Anmelden..."
 msgid "Your password has successfully been reset"
 msgstr "Das Passwort wurde erfolgreich zurückgesetzt"
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:254
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:252
 #, elixir-autogen, elixir-format
 msgid "An account with email %{email} already exists. Please enter your password to link your OIDC account."
 msgstr "Ein Konto mit der E-Mail %{email} existiert bereits. Bitte geben Sie Ihr Passwort ein, um Ihr OIDC-Konto zu verknüpfen."
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:289
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:287
 #, elixir-autogen, elixir-format
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -84,17 +84,17 @@ msgstr "Falsches Passwort. Bitte versuchen Sie es erneut."
 msgid "Invalid session. Please try again."
 msgstr "Ungültige Sitzung. Bitte versuchen Sie es erneut."
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:281
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:279
 #, elixir-autogen, elixir-format
 msgid "Link Account"
 msgstr "Konto verknüpfen"
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:252
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:250
 #, elixir-autogen, elixir-format
 msgid "Link OIDC Account"
 msgstr "OIDC-Konto verknüpfen"
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:280
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:278
 #, elixir-autogen, elixir-format
 msgid "Linking..."
 msgstr "Verknüpfen..."
@@ -130,12 +130,12 @@ msgstr "Die E-Mail-Adresse aus Ihrem OIDC-Provider ist bereits für ein anderes
 msgid "This OIDC account is already linked to another user. Please contact support."
 msgstr "Dieses OIDC-Konto ist bereits mit einem anderen Benutzer verknüpft. Bitte kontaktieren Sie den Support."
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:235
-#, elixir-autogen, elixir-format
-msgid "Language selection"
-msgstr "Sprachauswahl"
+#~ #: lib/mv_web/live/auth/link_oidc_account_live.ex:67
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Failed to activate account: %{error}"
+#~ msgstr "Aktivierung des Kontos fehlgeschlagen: %{error}"
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:242
-#, elixir-autogen, elixir-format
-msgid "Select language"
-msgstr "Sprache auswählen"
+#~ #: lib/mv_web/live/auth/link_oidc_account_live.ex:118
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Failed to link account: %{error}"
+#~ msgstr "Verknüpfung des Kontos fehlgeschlagen: %{error}"
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index 22ff795..facf4f3 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -650,3 +650,8 @@ msgstr "E-Mail kann nicht aktualisiert werden: Diese E-Mail-Adresse ist bereits
 #, elixir-autogen, elixir-format
 msgid "This email is already linked to a different OIDC account. Cannot link multiple OIDC providers to the same account."
 msgstr "Diese E-Mail-Adresse ist bereits mit einem anderen OIDC-Konto verknüpft. Es können nicht mehrere OIDC-Provider mit demselben Konto verknüpft werden."
+
+#~ #: lib/mv_web/controllers/auth_controller.ex:54
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Unable to sign in with OIDC. Please try again."
+#~ msgstr "Anmeldung mit OIDC fehlgeschlagen. Bitte versuchen Sie es erneut."
diff --git a/priv/gettext/en/LC_MESSAGES/auth.po b/priv/gettext/en/LC_MESSAGES/auth.po
index 921d76b..f8e5564 100644
--- a/priv/gettext/en/LC_MESSAGES/auth.po
+++ b/priv/gettext/en/LC_MESSAGES/auth.po
@@ -32,7 +32,7 @@ msgstr ""
 msgid "Need an account?"
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:268
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:266
 #, elixir-autogen
 msgid "Password"
 msgstr ""
@@ -61,12 +61,12 @@ msgstr ""
 msgid "Your password has successfully been reset"
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:254
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:252
 #, elixir-autogen, elixir-format
 msgid "An account with email %{email} already exists. Please enter your password to link your OIDC account."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:289
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:287
 #, elixir-autogen, elixir-format
 msgid "Cancel"
 msgstr ""
@@ -81,17 +81,17 @@ msgstr ""
 msgid "Invalid session. Please try again."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:281
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:279
 #, elixir-autogen, elixir-format
 msgid "Link Account"
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:252
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:250
 #, elixir-autogen, elixir-format
 msgid "Link OIDC Account"
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:280
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:278
 #, elixir-autogen, elixir-format
 msgid "Linking..."
 msgstr ""
@@ -127,12 +127,7 @@ msgstr ""
 msgid "This OIDC account is already linked to another user. Please contact support."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:235
-#, elixir-autogen, elixir-format
-msgid "Language selection"
-msgstr ""
-
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:242
-#, elixir-autogen, elixir-format
-msgid "Select language"
-msgstr ""
+#~ #: lib/mv_web/live/auth/link_oidc_account_live.ex:118
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Failed to link account: %{error}"
+#~ msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index bc0e16c..2b414eb 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -651,3 +651,8 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "This email is already linked to a different OIDC account. Cannot link multiple OIDC providers to the same account."
 msgstr ""
+
+#~ #: lib/mv_web/controllers/auth_controller.ex:54
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Unable to sign in with OIDC. Please try again."
+#~ msgstr ""