diff --git a/apps/login/locales/de.json b/apps/login/locales/de.json
index ba0fce27e3..5e8756c89b 100644
--- a/apps/login/locales/de.json
+++ b/apps/login/locales/de.json
@@ -183,7 +183,8 @@
     "title": "Authentifizierungsmethode auswählen",
     "description": "Wählen Sie die Methode, mit der Sie sich authentifizieren möchten.",
     "noMethodsAvailable": "Keine Authentifizierungsmethoden verfügbar",
-    "allSetup": "Sie haben bereits einen Authentifikator eingerichtet!"
+    "allSetup": "Sie haben bereits einen Authentifikator eingerichtet!",
+    "linkWithIDP": "oder verknüpfe mit einem Identitätsanbieter"
   },
   "error": {
     "unknownContext": "Der Kontext des Benutzers konnte nicht ermittelt werden. Stellen Sie sicher, dass Sie zuerst den Benutzernamen eingeben oder einen loginName als Suchparameter angeben.",
diff --git a/apps/login/locales/en.json b/apps/login/locales/en.json
index 265304387f..3101f222d5 100644
--- a/apps/login/locales/en.json
+++ b/apps/login/locales/en.json
@@ -183,7 +183,8 @@
     "title": "Choose authentication method",
     "description": "Select the method you would like to authenticate",
     "noMethodsAvailable": "No authentication methods available",
-    "allSetup": "You have already setup an authenticator!"
+    "allSetup": "You have already setup an authenticator!",
+    "linkWithIDP": "or link with an Identity Provider"
   },
   "error": {
     "unknownContext": "Could not get the context of the user. Make sure to enter the username first or provide a loginName as searchParam.",
diff --git a/apps/login/locales/es.json b/apps/login/locales/es.json
index 35bbb9385d..5a9b6f6324 100644
--- a/apps/login/locales/es.json
+++ b/apps/login/locales/es.json
@@ -183,7 +183,8 @@
     "title": "Seleccionar método de autenticación",
     "description": "Selecciona el método con el que deseas autenticarte",
     "noMethodsAvailable": "No hay métodos de autenticación disponibles",
-    "allSetup": "¡Ya has configurado un autenticador!"
+    "allSetup": "¡Ya has configurado un autenticador!",
+    "linkWithIDP": "o vincúlalo con un proveedor de identidad"
   },
   "error": {
     "unknownContext": "No se pudo obtener el contexto del usuario. Asegúrate de ingresar primero el nombre de usuario o proporcionar un loginName como parámetro de búsqueda.",
diff --git a/apps/login/locales/it.json b/apps/login/locales/it.json
index 4e21e3dc9d..1423c43cfe 100644
--- a/apps/login/locales/it.json
+++ b/apps/login/locales/it.json
@@ -183,7 +183,8 @@
     "title": "Seleziona metodo di autenticazione",
     "description": "Seleziona il metodo con cui desideri autenticarti",
     "noMethodsAvailable": "Nessun metodo di autenticazione disponibile",
-    "allSetup": "Hai già configurato un autenticatore!"
+    "allSetup": "Hai già configurato un autenticatore!",
+    "linkWithIDP": "o collega con un Identity Provider"
   },
   "error": {
     "unknownContext": "Impossibile ottenere il contesto dell'utente. Assicurati di inserire prima il nome utente o di fornire un loginName come parametro di ricerca.",
diff --git a/apps/login/locales/zh.json b/apps/login/locales/zh.json
index 818a8b449e..acd03cc5b6 100644
--- a/apps/login/locales/zh.json
+++ b/apps/login/locales/zh.json
@@ -183,7 +183,8 @@
     "title": "选择认证方式",
     "description": "选择您想使用的认证方法",
     "noMethodsAvailable": "没有可用的认证方法",
-    "allSetup": "您已经设置好了一个认证器！"
+    "allSetup": "您已经设置好了一个认证器！",
+    "linkWithIDP": "或将其与身份提供者关联"
   },
   "error": {
     "unknownContext": "无法获取用户的上下文。请先输入用户名或提供 loginName 作为搜索参数。",
diff --git a/apps/login/src/app/(login)/authenticator/set/page.tsx b/apps/login/src/app/(login)/authenticator/set/page.tsx
index 3235afc57f..7203484df0 100644
--- a/apps/login/src/app/(login)/authenticator/set/page.tsx
+++ b/apps/login/src/app/(login)/authenticator/set/page.tsx
@@ -133,9 +133,9 @@ export default async function Page(props: {
           ></ChooseAuthenticatorToSetup>
         )}
 
-        <p className="ztdl-p text-center">
-          or sign in with an Identity Provider
-        </p>
+        <div className="py-3 flex flex-col">
+          <p className="ztdl-p text-center">{t("linkWithIDP")}</p>
+        </div>
 
         {loginSettings?.allowExternalIdp && identityProviders && (
           <SignInWithIdp
diff --git a/apps/login/src/app/(login)/idp/[provider]/success/page.tsx b/apps/login/src/app/(login)/idp/[provider]/success/page.tsx
index d63b73f9c4..200c3108a6 100644
--- a/apps/login/src/app/(login)/idp/[provider]/success/page.tsx
+++ b/apps/login/src/app/(login)/idp/[provider]/success/page.tsx
@@ -159,6 +159,29 @@ export default async function Page(props: {
 
   const providerType = idpTypeToIdentityProviderType(idp.type);
 
+  if (link && options?.isLinkingAllowed) {
+    console.log(userId);
+    const idpLink = await addIDPLink(
+      {
+        id: idpInformation.idpId,
+        userId: idpInformation.userId,
+        userName: idpInformation.userName,
+      },
+      userId,
+    );
+
+    if (!idpLink) {
+      return linkingFailed(branding);
+    } else {
+      return linkingSuccess(
+        userId,
+        { idpIntentId: id, idpIntentToken: token },
+        authRequestId,
+        branding,
+      );
+    }
+  }
+
   // search for potential user via username, then link
   if (options?.isLinkingAllowed) {
     let foundUser;
diff --git a/apps/login/src/lib/server/email.ts b/apps/login/src/lib/server/email.ts
index 51eb1a019b..1f16d86256 100644
--- a/apps/login/src/lib/server/email.ts
+++ b/apps/login/src/lib/server/email.ts
@@ -120,6 +120,7 @@ export async function sendVerificationRedirectWithoutCheck(command: {
   if (!authMethodResponse || !authMethodResponse.authMethodTypes) {
     return { error: "Could not load possible authenticators" };
   }
+
   // if no authmethods are found on the user, redirect to set one up
   if (
     authMethodResponse &&
diff --git a/apps/login/src/lib/server/loginname.ts b/apps/login/src/lib/server/loginname.ts
index 295f9b455f..5100541a21 100644
--- a/apps/login/src/lib/server/loginname.ts
+++ b/apps/login/src/lib/server/loginname.ts
@@ -170,6 +170,8 @@ export async function sendLoginname(command: SendLoginnameCommand) {
       session.factors?.user?.id,
     );
 
+    console.log(methods);
+
     if (!methods.authMethodTypes || !methods.authMethodTypes.length) {
       if (
         potentialUsers[0].type.case === "human" &&