diff --git a/apps/login/src/lib/server/password.ts b/apps/login/src/lib/server/password.ts
index 88f3c628d2f..fdd3b448e59 100644
--- a/apps/login/src/lib/server/password.ts
+++ b/apps/login/src/lib/server/password.ts
@@ -18,7 +18,7 @@ export async function resetPassword(command: ResetPasswordCommand) {
     users.details.totalResult !== BigInt(1) ||
     !users.result[0].userId
   ) {
-    throw Error("Could not find user");
+    return { error: "Could not find user" };
   }
   const userId = users.result[0].userId;
 
diff --git a/apps/login/src/lib/server/register.ts b/apps/login/src/lib/server/register.ts
index c6ed2b7a9df..0c906c60c6b 100644
--- a/apps/login/src/lib/server/register.ts
+++ b/apps/login/src/lib/server/register.ts
@@ -2,6 +2,7 @@
 
 import { addHumanUser } from "@/lib/zitadel";
 import { createSessionForUserIdAndUpdateCookie } from "@/utils/session";
+import { Factors } from "@zitadel/proto/zitadel/session/v2/session_pb";
 
 type RegisterUserCommand = {
   email: string;
@@ -11,6 +12,13 @@ type RegisterUserCommand = {
   organization?: string;
   authRequestId?: string;
 };
+
+export type RegisterUserResponse = {
+  userId: string;
+  sessionId: string;
+  factors: Factors | undefined;
+};
+
 export async function registerUser(command: RegisterUserCommand) {
   const human = await addHumanUser({
     email: command.email,
@@ -19,8 +27,9 @@ export async function registerUser(command: RegisterUserCommand) {
     password: command.password ? command.password : undefined,
     organization: command.organization,
   });
+
   if (!human) {
-    throw Error("Could not create user");
+    return { error: "Could not create user" };
   }
 
   return createSessionForUserIdAndUpdateCookie(
diff --git a/apps/login/src/lib/server/u2f.ts b/apps/login/src/lib/server/u2f.ts
index e8a780449cd..3f61f526fa4 100644
--- a/apps/login/src/lib/server/u2f.ts
+++ b/apps/login/src/lib/server/u2f.ts
@@ -23,6 +23,10 @@ export async function addU2F(command: RegisterU2FCommand) {
     sessionId: command.sessionId,
   });
 
+  if (!sessionCookie) {
+    return { error: "Could not get session" };
+  }
+
   const session = await getSession({
     sessionId: sessionCookie.id,
     sessionToken: sessionCookie.token,
@@ -31,14 +35,15 @@ export async function addU2F(command: RegisterU2FCommand) {
   const domain = headers().get("host");
 
   if (!domain) {
-    throw Error("Could not get domain");
+    return { error: "Could not get domain" };
   }
 
   const userId = session?.session?.factors?.user?.id;
 
-  if (!userId) {
-    throw Error("Could not get session");
+  if (!session || !userId) {
+    return { error: "Could not get session" };
   }
+
   return registerU2F(userId, domain);
 }
 
@@ -65,7 +70,7 @@ export async function verifyU2F(command: VerifyU2FCommand) {
   const userId = session?.session?.factors?.user?.id;
 
   if (!userId) {
-    throw new Error("Could not get session");
+    return { error: "Could not get session" };
   }
 
   const req = create(VerifyU2FRegistrationRequestSchema, {
diff --git a/apps/login/src/lib/zitadel.ts b/apps/login/src/lib/zitadel.ts
index 3bf51753e50..43715a94cbc 100644
--- a/apps/login/src/lib/zitadel.ts
+++ b/apps/login/src/lib/zitadel.ts
@@ -451,7 +451,7 @@ export function createUser(
  * @param userId the id of the user where the email should be set
  * @returns the newly set email
  */
-export async function passwordReset(userId: string): Promise<any> {
+export async function passwordReset(userId: string) {
   return userService.passwordReset(
     {
       userId,
diff --git a/apps/login/src/ui/PasswordForm.tsx b/apps/login/src/ui/PasswordForm.tsx
index d7b50979cac..919e56c7748 100644
--- a/apps/login/src/ui/PasswordForm.tsx
+++ b/apps/login/src/ui/PasswordForm.tsx
@@ -77,10 +77,15 @@ export default function PasswordForm({
       loginName,
       organization,
     }).catch((error: Error) => {
+      console.error(error);
       setLoading(false);
-      setError(error.message ?? "Could not reset password");
+      setError("Could not reset password");
     });
 
+    if (response && "error" in response) {
+      setError(response.error);
+    }
+
     setLoading(false);
 
     if (response) {
diff --git a/apps/login/src/ui/RegisterFormWithoutPassword.tsx b/apps/login/src/ui/RegisterFormWithoutPassword.tsx
index e5e76877232..64999f75f41 100644
--- a/apps/login/src/ui/RegisterFormWithoutPassword.tsx
+++ b/apps/login/src/ui/RegisterFormWithoutPassword.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { registerUser } from "@/lib/server/register";
+import { registerUser, RegisterUserResponse } from "@/lib/server/register";
 import { LegalAndSupportSettings } from "@zitadel/proto/zitadel/settings/v2/legal_settings_pb";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
@@ -63,10 +63,15 @@ export default function RegisterFormWithoutPassword({
       lastName: values.lastname,
       organization: organization,
     }).catch((error) => {
-      setError(error.message ?? "Could not register user");
+      console.error(error);
+      setError("Could not register user");
       setLoading(false);
     });
 
+    if (response && "error" in response) {
+      setError(response.error);
+    }
+
     setLoading(false);
 
     return response;
@@ -89,7 +94,7 @@ export default function RegisterFormWithoutPassword({
     if (withPassword) {
       return router.push(`/register?` + new URLSearchParams(registerParams));
     } else {
-      const session = await submitAndRegister(value);
+      const session = (await submitAndRegister(value)) as RegisterUserResponse;
 
       const params = new URLSearchParams({});
       if (session?.factors?.user?.loginName) {
diff --git a/apps/login/src/ui/RegisterU2F.tsx b/apps/login/src/ui/RegisterU2F.tsx
index 9a041205901..d117eaeed27 100644
--- a/apps/login/src/ui/RegisterU2F.tsx
+++ b/apps/login/src/ui/RegisterU2F.tsx
@@ -2,6 +2,7 @@
 
 import { addU2F, verifyU2F } from "@/lib/server/u2f";
 import { coerceToArrayBuffer, coerceToBase64Url } from "@/utils/base64";
+import { RegisterU2FResponse } from "@zitadel/proto/zitadel/user/v2/user_service_pb";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
 import Alert from "./Alert";
@@ -9,8 +10,6 @@ import BackButton from "./BackButton";
 import { Button, ButtonVariants } from "./Button";
 import { Spinner } from "./Spinner";
 
-type Inputs = {};
-
 type Props = {
   sessionId: string;
   authRequestId?: string;
@@ -41,8 +40,9 @@ export default function RegisterU2F({
       publicKeyCredential,
       sessionId,
     }).catch((error: Error) => {
+      console.error(error);
       setLoading(false);
-      setError(error.message);
+      setError("An error on verifying passkey occurred");
     });
 
     setLoading(false);
@@ -55,20 +55,27 @@ export default function RegisterU2F({
     setLoading(true);
     const response = await addU2F({
       sessionId,
-    }).catch((error) => {
+    }).catch((error: Error) => {
+      console.error(error);
       setLoading(false);
-      setError(error.message);
+      setError("An error on registering passkey");
     });
 
-    if (!response) {
+    if (response && "error" in response && response?.error) {
+      setError(response?.error);
+    }
+
+    if (!response || "u2fId" in response) {
       setLoading(false);
       setError("An error on registering passkey");
       return;
     }
 
-    const u2fId = response?.u2fId;
+    const u2fResponse = response as unknown as RegisterU2FResponse;
+
+    const u2fId = u2fResponse.u2fId;
     const options: CredentialCreationOptions =
-      (response?.publicKeyCredentialCreationOptions as CredentialCreationOptions) ??
+      (u2fResponse?.publicKeyCredentialCreationOptions as CredentialCreationOptions) ??
       {};
 
     if (options.publicKey) {
diff --git a/apps/login/src/ui/SetPasswordForm.tsx b/apps/login/src/ui/SetPasswordForm.tsx
index d61c5f0761d..c657de0b027 100644
--- a/apps/login/src/ui/SetPasswordForm.tsx
+++ b/apps/login/src/ui/SetPasswordForm.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { registerUser } from "@/lib/server/register";
+import { registerUser, RegisterUserResponse } from "@/lib/server/register";
 import {
   lowerCaseValidator,
   numberValidator,
@@ -66,9 +66,14 @@ export default function SetPasswordForm({
       authRequestId: authRequestId,
       password: values.password,
     }).catch((error: Error) => {
-      setError(error.message ?? "Could not register user");
+      console.error(error);
+      setError("Could not register user");
     });
 
+    if (response && "error" in response) {
+      setError(response.error);
+    }
+
     setLoading(false);
 
     if (!response) {
@@ -76,10 +81,12 @@ export default function SetPasswordForm({
       return;
     }
 
-    const params = new URLSearchParams({ userId: response.userId });
+    const userReponse = response as RegisterUserResponse;
 
-    if (response.factors?.user?.loginName) {
-      params.append("loginName", response.factors.user.loginName);
+    const params = new URLSearchParams({ userId: userReponse.userId });
+
+    if (userReponse.factors?.user?.loginName) {
+      params.append("loginName", userReponse.factors.user.loginName);
     }
     if (authRequestId) {
       params.append("authRequestId", authRequestId);
@@ -87,8 +94,8 @@ export default function SetPasswordForm({
     if (organization) {
       params.append("organization", organization);
     }
-    if (response && response.sessionId) {
-      params.append("sessionId", response.sessionId);
+    if (userReponse && userReponse.sessionId) {
+      params.append("sessionId", userReponse.sessionId);
     }
 
     return router.push(`/verify?` + params);
diff --git a/apps/login/src/ui/UsernameForm.tsx b/apps/login/src/ui/UsernameForm.tsx
index 93d21bcfdfe..e08744acab2 100644
--- a/apps/login/src/ui/UsernameForm.tsx
+++ b/apps/login/src/ui/UsernameForm.tsx
@@ -51,6 +51,7 @@ export default function UsernameForm({
       organization,
       authRequestId,
     }).catch((error: Error) => {
+      console.error(error);
       setError("An internal error occurred");
     });