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 2262723..05faf67 100644
--- a/lib/mv_web/live/auth/link_oidc_account_live.ex
+++ b/lib/mv_web/live/auth/link_oidc_account_live.ex
@@ -232,61 +232,64 @@ defmodule MvWeb.LinkOidcAccountLive do
     ~H"""
     <div class="mx-auto max-w-sm mt-16">
       <%!-- Language Selector --%>
-      <div class="flex justify-center mb-4">
+      <nav aria-label={dgettext("auth", "Language selection")} 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>
-      </div>
+      </nav>
 
-      <.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>
+      <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>
 
-      <.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>
+        <.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>
-          <% end %>
 
-          <div>
-            <.button phx-disable-with={dgettext("auth", "Linking...")} class="w-full">
-              {dgettext("auth", "Link Account")}
-            </.button>
+            <%= 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>
-        </div>
-      </.form>
+        </.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 class="mt-4 text-center text-sm">
+          <.link navigate={~p"/sign-in"} class="text-brand hover:underline">
+            {dgettext("auth", "Cancel")}
+          </.link>
+        </div>
+      </main>
     </div>
     """
   end
diff --git a/mix.exs b/mix.exs
index 86b1010..b215d59 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]
+      extra_applications: [:logger, :runtime_tools, :gettext]
     ]
   end
 
diff --git a/priv/gettext/auth.pot b/priv/gettext/auth.pot
index 79e5941..ebb8d3c 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:141
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:268
 #, elixir-autogen
 msgid "Password"
 msgstr ""
@@ -65,52 +65,78 @@ msgstr ""
 msgid "Your password has successfully been reset"
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:130
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:254
 #, 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:160
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:289
 #, elixir-autogen, elixir-format
 msgid "Cancel"
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:118
-#, elixir-autogen, elixir-format
-msgid "Failed to link account: %{error}"
-msgstr ""
-
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:65
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:163
 #, elixir-autogen, elixir-format
 msgid "Incorrect password. Please try again."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:40
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:37
 #, elixir-autogen, elixir-format
 msgid "Invalid session. Please try again."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:152
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:281
 #, elixir-autogen, elixir-format
 msgid "Link Account"
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:128
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:252
 #, elixir-autogen, elixir-format
 msgid "Link OIDC Account"
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:151
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:280
 #, elixir-autogen, elixir-format
 msgid "Linking..."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:34
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:40
 #, elixir-autogen, elixir-format
 msgid "Session expired. Please try again."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:108
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:209
 #, elixir-autogen, elixir-format
 msgid "Your OIDC account has been successfully linked! Redirecting to complete sign-in..."
 msgstr ""
+
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:76
+#, elixir-autogen, elixir-format
+msgid "Account activated! Redirecting to complete sign-in..."
+msgstr ""
+
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:119
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:123
+#, elixir-autogen, elixir-format
+msgid "Failed to link account. Please try again or contact support."
+msgstr ""
+
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:108
+#, elixir-autogen, elixir-format
+msgid "The email address from your OIDC provider is already registered to another account. Please change your email in the identity provider or contact support."
+msgstr ""
+
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:98
+#, 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 60d905e..f0cbdf3 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:141
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:268
 #, elixir-autogen
 msgid "Password"
 msgstr "Passwort"
@@ -64,77 +64,78 @@ 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:130
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:254
 #, 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:61
-#, elixir-autogen, elixir-format
-msgid "Account activated! Redirecting to complete sign-in..."
-msgstr "Konto aktiviert! Sie werden zur Anmeldung weitergeleitet..."
-
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:160
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:289
 #, elixir-autogen, elixir-format
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: 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:118
-#, elixir-autogen, elixir-format
-msgid "Failed to link account: %{error}"
-msgstr "Verknüpfung des Kontos fehlgeschlagen: %{error}"
-
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:65
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:163
 #, elixir-autogen, elixir-format
 msgid "Incorrect password. Please try again."
 msgstr "Falsches Passwort. Bitte versuchen Sie es erneut."
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:40
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:37
 #, elixir-autogen, elixir-format
 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:152
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:281
 #, elixir-autogen, elixir-format
 msgid "Link Account"
 msgstr "Konto verknüpfen"
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:128
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:252
 #, elixir-autogen, elixir-format
 msgid "Link OIDC Account"
 msgstr "OIDC-Konto verknüpfen"
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:151
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:280
 #, elixir-autogen, elixir-format
 msgid "Linking..."
 msgstr "Verknüpfen..."
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:34
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:40
 #, elixir-autogen, elixir-format
 msgid "Session expired. Please try again."
 msgstr "Sitzung abgelaufen. Bitte versuchen Sie es erneut."
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:79
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:209
 #, elixir-autogen, elixir-format
-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."
+msgid "Your OIDC account has been successfully linked! Redirecting to complete sign-in..."
+msgstr "Ihr OIDC-Konto wurde erfolgreich verknüpft! Sie werden zur Anmeldung weitergeleitet..."
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:89
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:76
 #, elixir-autogen, elixir-format
-msgid "The email address from your OIDC provider is already registered to another account. Please change your email in the identity provider or contact support."
-msgstr "Die E-Mail-Adresse aus Ihrem OIDC-Provider ist bereits für ein anderes Konto registriert. Bitte ändern Sie Ihre E-Mail-Adresse im Identity-Provider oder kontaktieren Sie den Support."
+msgid "Account activated! Redirecting to complete sign-in..."
+msgstr "Konto aktiviert! Sie werden zur Anmeldung weitergeleitet..."
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:100
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:119
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:123
 #, elixir-autogen, elixir-format
 msgid "Failed to link account. Please try again or contact support."
 msgstr "Verknüpfung des Kontos fehlgeschlagen. Bitte versuchen Sie es erneut oder kontaktieren Sie den Support."
 
 #: lib/mv_web/live/auth/link_oidc_account_live.ex:108
 #, elixir-autogen, elixir-format
-msgid "Your OIDC account has been successfully linked! Redirecting to complete sign-in..."
-msgstr "Ihr OIDC-Konto wurde erfolgreich verknüpft! Sie werden zur Anmeldung weitergeleitet..."
+msgid "The email address from your OIDC provider is already registered to another account. Please change your email in the identity provider or contact support."
+msgstr "Die E-Mail-Adresse aus Ihrem OIDC-Provider ist bereits für ein anderes Konto registriert. Bitte ändern Sie Ihre E-Mail-Adresse im Identity-Provider oder kontaktieren Sie den Support."
+
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:98
+#, elixir-autogen, elixir-format
+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:242
+#, elixir-autogen, elixir-format
+msgid "Select language"
+msgstr "Sprache auswählen"
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index a15489d..22ff795 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -223,7 +223,7 @@ msgstr "erstellt"
 msgid "update"
 msgstr "aktualisiert"
 
-#: lib/mv_web/controllers/auth_controller.ex:87
+#: lib/mv_web/controllers/auth_controller.ex:60
 #, elixir-autogen, elixir-format
 msgid "Incorrect email or password"
 msgstr "Falsche E-Mail oder Passwort"
@@ -233,27 +233,27 @@ msgstr "Falsche E-Mail oder Passwort"
 msgid "Member %{action} successfully"
 msgstr "Mitglied %{action} erfolgreich"
 
-#: lib/mv_web/controllers/auth_controller.ex:14
+#: lib/mv_web/controllers/auth_controller.ex:26
 #, elixir-autogen, elixir-format
 msgid "You are now signed in"
 msgstr "Sie sind jetzt angemeldet"
 
-#: lib/mv_web/controllers/auth_controller.ex:132
+#: lib/mv_web/controllers/auth_controller.ex:186
 #, elixir-autogen, elixir-format
 msgid "You are now signed out"
 msgstr "Sie sind jetzt abgemeldet"
 
-#: lib/mv_web/controllers/auth_controller.ex:77
+#: lib/mv_web/controllers/auth_controller.ex:85
 #, elixir-autogen, elixir-format
 msgid "You have already signed in another way, but have not confirmed your account.\nYou can confirm your account using the link we sent to you, or by resetting your password.\n"
 msgstr "Sie haben sich bereits auf andere Weise angemeldet, aber Ihr Konto noch nicht bestätigt.\nSie können Ihr Konto über den Link bestätigen, den wir Ihnen gesendet haben, oder durch Zurücksetzen Ihres Passworts.\n"
 
-#: lib/mv_web/controllers/auth_controller.ex:12
+#: lib/mv_web/controllers/auth_controller.ex:24
 #, elixir-autogen, elixir-format
 msgid "Your email address has now been confirmed"
 msgstr "Ihre E-Mail-Adresse wurde bestätigt"
 
-#: lib/mv_web/controllers/auth_controller.ex:13
+#: lib/mv_web/controllers/auth_controller.ex:25
 #, elixir-autogen, elixir-format
 msgid "Your password has successfully been reset"
 msgstr "Ihr Passwort wurde erfolgreich zurückgesetzt"
@@ -620,32 +620,33 @@ msgstr "Klicke um zu sortieren"
 msgid "First name"
 msgstr "Vorname"
 
-#: lib/mv_web/controllers/auth_controller.ex:113
+#: lib/mv_web/controllers/auth_controller.ex:167
 #, elixir-autogen, elixir-format
 msgid "An account with this email already exists. Please verify your password to link your OIDC account."
 msgstr "Ein Konto mit dieser E-Mail existiert bereits. Bitte verifizieren Sie Ihr Passwort, um Ihr OIDC-Konto zu verknüpfen."
 
-#: lib/mv_web/controllers/auth_controller.ex:66
+#: lib/mv_web/controllers/auth_controller.ex:77
 #, elixir-autogen, elixir-format
 msgid "Unable to authenticate with OIDC. Please try again."
 msgstr "OIDC-Authentifizierung fehlgeschlagen. Bitte versuchen Sie es erneut."
 
-#: 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."
-
-#: lib/mv_web/controllers/auth_controller.ex:122
+#: lib/mv_web/controllers/auth_controller.ex:152
 #, elixir-autogen, elixir-format
 msgid "Unable to sign in. Please try again."
 msgstr "Anmeldung fehlgeschlagen. Bitte versuchen Sie es erneut."
 
-#: lib/mv_web/controllers/auth_controller.ex:120
+#: lib/mv_web/controllers/auth_controller.ex:92
+#: lib/mv_web/controllers/auth_controller.ex:97
+#, elixir-autogen, elixir-format
+msgid "Authentication failed. Please try again."
+msgstr "Authentifizierung fehlgeschlagen. Bitte versuchen Sie es erneut."
+
+#: lib/mv_web/controllers/auth_controller.ex:124
 #, elixir-autogen, elixir-format
 msgid "Cannot update email: This email is already registered to another account. Please change your email in the identity provider."
 msgstr "E-Mail kann nicht aktualisiert werden: Diese E-Mail-Adresse ist bereits für ein anderes Konto registriert. Bitte ändern Sie Ihre E-Mail-Adresse im Identity-Provider."
 
-#: lib/mv_web/controllers/auth_controller.ex:126
+#: lib/mv_web/controllers/auth_controller.ex:130
 #, 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."
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index 0976553..ebcda96 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -224,7 +224,7 @@ msgstr ""
 msgid "update"
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:87
+#: lib/mv_web/controllers/auth_controller.ex:60
 #, elixir-autogen, elixir-format
 msgid "Incorrect email or password"
 msgstr ""
@@ -234,27 +234,27 @@ msgstr ""
 msgid "Member %{action} successfully"
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:14
+#: lib/mv_web/controllers/auth_controller.ex:26
 #, elixir-autogen, elixir-format
 msgid "You are now signed in"
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:132
+#: lib/mv_web/controllers/auth_controller.ex:186
 #, elixir-autogen, elixir-format
 msgid "You are now signed out"
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:77
+#: lib/mv_web/controllers/auth_controller.ex:85
 #, elixir-autogen, elixir-format
 msgid "You have already signed in another way, but have not confirmed your account.\nYou can confirm your account using the link we sent to you, or by resetting your password.\n"
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:12
+#: lib/mv_web/controllers/auth_controller.ex:24
 #, elixir-autogen, elixir-format
 msgid "Your email address has now been confirmed"
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:13
+#: lib/mv_web/controllers/auth_controller.ex:25
 #, elixir-autogen, elixir-format
 msgid "Your password has successfully been reset"
 msgstr ""
@@ -621,22 +621,33 @@ msgstr ""
 msgid "First name"
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:113
+#: lib/mv_web/controllers/auth_controller.ex:167
 #, elixir-autogen, elixir-format
 msgid "An account with this email already exists. Please verify your password to link your OIDC account."
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:66
+#: lib/mv_web/controllers/auth_controller.ex:77
 #, elixir-autogen, elixir-format
 msgid "Unable to authenticate with OIDC. Please try again."
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:54
-#, elixir-autogen, elixir-format
-msgid "Unable to sign in with OIDC. Please try again."
-msgstr ""
-
-#: lib/mv_web/controllers/auth_controller.ex:122
+#: lib/mv_web/controllers/auth_controller.ex:152
 #, elixir-autogen, elixir-format
 msgid "Unable to sign in. Please try again."
 msgstr ""
+
+#: lib/mv_web/controllers/auth_controller.ex:92
+#: lib/mv_web/controllers/auth_controller.ex:97
+#, elixir-autogen, elixir-format
+msgid "Authentication failed. Please try again."
+msgstr ""
+
+#: lib/mv_web/controllers/auth_controller.ex:124
+#, elixir-autogen, elixir-format
+msgid "Cannot update email: This email is already registered to another account. Please change your email in the identity provider."
+msgstr ""
+
+#: lib/mv_web/controllers/auth_controller.ex:130
+#, 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 ""
diff --git a/priv/gettext/en/LC_MESSAGES/auth.po b/priv/gettext/en/LC_MESSAGES/auth.po
index 85f611c..921d76b 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:141
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:268
 #, elixir-autogen
 msgid "Password"
 msgstr ""
@@ -61,52 +61,78 @@ msgstr ""
 msgid "Your password has successfully been reset"
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:130
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:254
 #, 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:160
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:289
 #, elixir-autogen, elixir-format
 msgid "Cancel"
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:118
-#, elixir-autogen, elixir-format
-msgid "Failed to link account: %{error}"
-msgstr ""
-
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:65
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:163
 #, elixir-autogen, elixir-format
 msgid "Incorrect password. Please try again."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:40
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:37
 #, elixir-autogen, elixir-format
 msgid "Invalid session. Please try again."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:152
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:281
 #, elixir-autogen, elixir-format
 msgid "Link Account"
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:128
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:252
 #, elixir-autogen, elixir-format
 msgid "Link OIDC Account"
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:151
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:280
 #, elixir-autogen, elixir-format
 msgid "Linking..."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:34
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:40
 #, elixir-autogen, elixir-format
 msgid "Session expired. Please try again."
 msgstr ""
 
-#: lib/mv_web/live/auth/link_oidc_account_live.ex:108
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:209
 #, elixir-autogen, elixir-format
 msgid "Your OIDC account has been successfully linked! Redirecting to complete sign-in..."
 msgstr ""
+
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:76
+#, elixir-autogen, elixir-format
+msgid "Account activated! Redirecting to complete sign-in..."
+msgstr ""
+
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:119
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:123
+#, elixir-autogen, elixir-format
+msgid "Failed to link account. Please try again or contact support."
+msgstr ""
+
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:108
+#, elixir-autogen, elixir-format
+msgid "The email address from your OIDC provider is already registered to another account. Please change your email in the identity provider or contact support."
+msgstr ""
+
+#: lib/mv_web/live/auth/link_oidc_account_live.ex:98
+#, 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/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index b3c6d77..bc0e16c 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -224,7 +224,7 @@ msgstr ""
 msgid "update"
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:87
+#: lib/mv_web/controllers/auth_controller.ex:60
 #, elixir-autogen, elixir-format
 msgid "Incorrect email or password"
 msgstr ""
@@ -234,27 +234,27 @@ msgstr ""
 msgid "Member %{action} successfully"
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:14
+#: lib/mv_web/controllers/auth_controller.ex:26
 #, elixir-autogen, elixir-format
 msgid "You are now signed in"
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:132
+#: lib/mv_web/controllers/auth_controller.ex:186
 #, elixir-autogen, elixir-format
 msgid "You are now signed out"
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:77
+#: lib/mv_web/controllers/auth_controller.ex:85
 #, elixir-autogen, elixir-format
 msgid "You have already signed in another way, but have not confirmed your account.\nYou can confirm your account using the link we sent to you, or by resetting your password.\n"
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:12
+#: lib/mv_web/controllers/auth_controller.ex:24
 #, elixir-autogen, elixir-format
 msgid "Your email address has now been confirmed"
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:13
+#: lib/mv_web/controllers/auth_controller.ex:25
 #, elixir-autogen, elixir-format
 msgid "Your password has successfully been reset"
 msgstr ""
@@ -621,22 +621,33 @@ msgstr ""
 msgid "First name"
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:113
+#: lib/mv_web/controllers/auth_controller.ex:167
 #, elixir-autogen, elixir-format
 msgid "An account with this email already exists. Please verify your password to link your OIDC account."
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:66
+#: lib/mv_web/controllers/auth_controller.ex:77
 #, elixir-autogen, elixir-format
 msgid "Unable to authenticate with OIDC. Please try again."
 msgstr ""
 
-#: lib/mv_web/controllers/auth_controller.ex:54
-#, elixir-autogen, elixir-format
-msgid "Unable to sign in with OIDC. Please try again."
-msgstr ""
-
-#: lib/mv_web/controllers/auth_controller.ex:122
+#: lib/mv_web/controllers/auth_controller.ex:152
 #, elixir-autogen, elixir-format
 msgid "Unable to sign in. Please try again."
 msgstr ""
+
+#: lib/mv_web/controllers/auth_controller.ex:92
+#: lib/mv_web/controllers/auth_controller.ex:97
+#, elixir-autogen, elixir-format
+msgid "Authentication failed. Please try again."
+msgstr ""
+
+#: lib/mv_web/controllers/auth_controller.ex:124
+#, elixir-autogen, elixir-format
+msgid "Cannot update email: This email is already registered to another account. Please change your email in the identity provider."
+msgstr ""
+
+#: lib/mv_web/controllers/auth_controller.ex:130
+#, 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 ""