diff --git a/apps/login/locales/de.json b/apps/login/locales/de.json
index 35450c661f0..a731b2b3c67 100644
--- a/apps/login/locales/de.json
+++ b/apps/login/locales/de.json
@@ -134,6 +134,7 @@
   },
   "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.",
-    "sessionExpired": "Ihre aktuelle Sitzung ist abgelaufen. Bitte melden Sie sich erneut an."
+    "sessionExpired": "Ihre aktuelle Sitzung ist abgelaufen. Bitte melden Sie sich erneut an.",
+    "failedLoading": "Daten konnten nicht geladen werden. Bitte versuchen Sie es erneut."
   }
 }
diff --git a/apps/login/locales/en.json b/apps/login/locales/en.json
index d19b1a36e36..4eae3c1a4c5 100644
--- a/apps/login/locales/en.json
+++ b/apps/login/locales/en.json
@@ -134,6 +134,7 @@
   },
   "error": {
     "unknownContext": "Could not get the context of the user. Make sure to enter the username first or provide a loginName as searchParam.",
-    "sessionExpired": "Your current session has expired. Please login again."
+    "sessionExpired": "Your current session has expired. Please login again.",
+    "failedLoading": "Failed to load data. Please try again."
   }
 }
diff --git a/apps/login/locales/es.json b/apps/login/locales/es.json
index ebd3598e3b0..4fa10378f28 100644
--- a/apps/login/locales/es.json
+++ b/apps/login/locales/es.json
@@ -134,6 +134,7 @@
   },
   "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.",
-    "sessionExpired": "Tu sesión actual ha expirado. Por favor, inicia sesión de nuevo."
+    "sessionExpired": "Tu sesión actual ha expirado. Por favor, inicia sesión de nuevo.",
+    "failedLoading": "No se pudieron cargar los datos. Por favor, inténtalo de nuevo."
   }
 }
diff --git a/apps/login/locales/it.json b/apps/login/locales/it.json
index 88b2f0b1e1d..8f7d4c33440 100644
--- a/apps/login/locales/it.json
+++ b/apps/login/locales/it.json
@@ -134,6 +134,7 @@
   },
   "error": {
     "unknownContext": "Impossibile ottenere il contesto dell'utente. Assicurati di inserire prima il nome utente o di fornire un loginName come parametro di ricerca.",
-    "sessionExpired": "La tua sessione attuale è scaduta. Effettua nuovamente l'accesso."
+    "sessionExpired": "La tua sessione attuale è scaduta. Effettua nuovamente l'accesso.",
+    "failedLoading": "Impossibile caricare i dati. Riprova."
   }
 }
diff --git a/apps/login/src/app/(login)/password/set/page.tsx b/apps/login/src/app/(login)/password/set/page.tsx
index 3be72f46dc5..6aa7ba23e80 100644
--- a/apps/login/src/app/(login)/password/set/page.tsx
+++ b/apps/login/src/app/(login)/password/set/page.tsx
@@ -3,7 +3,11 @@ import { DynamicTheme } from "@/components/dynamic-theme";
 import { SetPasswordForm } from "@/components/set-password-form";
 import { UserAvatar } from "@/components/user-avatar";
 import { loadMostRecentSession } from "@/lib/session";
-import { getBrandingSettings, getLoginSettings } from "@/lib/zitadel";
+import {
+  getBrandingSettings,
+  getLoginSettings,
+  getPasswordComplexitySettings,
+} from "@/lib/zitadel";
 import { getLocale, getTranslations } from "next-intl/server";
 
 export default async function Page({
@@ -14,24 +18,21 @@ export default async function Page({
   const locale = getLocale();
   const t = await getTranslations({ locale, namespace: "password" });
 
-  const { loginName, organization, authRequestId, alt } = searchParams;
+  const { loginName, organization, authRequestId, code } = searchParams;
 
   // also allow no session to be found (ignoreUnkownUsername)
-  let sessionFactors;
-  try {
-    sessionFactors = await loadMostRecentSession({
-      loginName,
-      organization,
-    });
-  } catch (error) {
-    // ignore error to continue to show the password form
-    console.warn(error);
-  }
+  const sessionFactors = await loadMostRecentSession({
+    loginName,
+    organization,
+  });
 
   const branding = await getBrandingSettings(organization);
-  const loginSettings = await getLoginSettings(organization);
 
-  console.log(sessionFactors);
+  const passwordComplexity = await getPasswordComplexitySettings(
+    sessionFactors?.factors?.user?.organizationId,
+  );
+
+  const loginSettings = await getLoginSettings(organization);
 
   return (
     <DynamicTheme branding={branding}>
@@ -56,13 +57,18 @@ export default async function Page({
           ></UserAvatar>
         )}
 
-        {loginName && (
+        {passwordComplexity && loginName ? (
           <SetPasswordForm
+            code={code}
             loginName={loginName}
             authRequestId={authRequestId}
             organization={organization}
-            loginSettings={loginSettings}
+            passwordComplexitySettings={passwordComplexity}
           />
+        ) : (
+          <div className="py-4">
+            <Alert>{t("error:failedLoading")}</Alert>
+          </div>
         )}
       </div>
     </DynamicTheme>
diff --git a/apps/login/src/components/set-password-form.tsx b/apps/login/src/components/set-password-form.tsx
index e865bfd4796..4baff6f6c01 100644
--- a/apps/login/src/components/set-password-form.tsx
+++ b/apps/login/src/components/set-password-form.tsx
@@ -6,6 +6,7 @@ import {
   symbolValidator,
   upperCaseValidator,
 } from "@/helpers/validators";
+import { changePassword } from "@/lib/server/password";
 import { RegisterUserResponse } from "@/lib/server/register";
 import { PasswordComplexitySettings } from "@zitadel/proto/zitadel/settings/v2/password_settings_pb";
 import { useTranslations } from "next-intl";
@@ -27,7 +28,9 @@ type Inputs =
   | FieldValues;
 
 type Props = {
+  code?: string;
   passwordComplexitySettings: PasswordComplexitySettings;
+  loginName: string;
   organization?: string;
   authRequestId?: string;
 };
diff --git a/apps/login/src/lib/server/password.ts b/apps/login/src/lib/server/password.ts
index d5ca8c671e1..6906f43039f 100644
--- a/apps/login/src/lib/server/password.ts
+++ b/apps/login/src/lib/server/password.ts
@@ -5,9 +5,11 @@ import {
   setSessionAndUpdateCookie,
 } from "@/lib/server/cookie";
 import {
+  getUserByID,
   listAuthenticationMethodTypes,
   listUsers,
   passwordReset,
+  setPassword,
 } from "@/lib/zitadel";
 import { create } from "@zitadel/client";
 import {
@@ -109,23 +111,17 @@ export async function sendPassword(command: UpdateSessionCommand) {
 }
 
 export async function changePassword(command: {
+  code?: string;
   userId: string;
   password: string;
 }) {
   // check for init state
-  const users = await listUsers({
-    loginName: command.loginName,
-    organizationId: command.organization,
-  });
+  const { user } = await getUserByID(command.userId);
 
-  if (
-    !users.details ||
-    users.details.totalResult !== BigInt(1) ||
-    !users.result[0].userId
-  ) {
+  if (!user || user.userId !== command.userId) {
     return { error: "Could not send Password Reset Link" };
   }
-  const userId = users.result[0].userId;
+  const userId = user.userId;
 
-  return passwordReset(userId);
+  return setPassword(userId, command.password);
 }
diff --git a/apps/login/src/lib/zitadel.ts b/apps/login/src/lib/zitadel.ts
index 3b032200e96..014602478c8 100644
--- a/apps/login/src/lib/zitadel.ts
+++ b/apps/login/src/lib/zitadel.ts
@@ -500,6 +500,18 @@ export async function passwordReset(userId: string) {
   );
 }
 
+export async function setPassword(userId: string, password: string) {
+  return userService.setPassword(
+    {
+      userId,
+      newPassword: {
+        password,
+      },
+    },
+    {},
+  );
+}
+
 /**
  *
  * @param server