diff --git a/packages/browser/src/utils/handleWebAuthnAuthentication.ts b/packages/browser/src/utils/handleWebAuthnAuthentication.ts
index 304402e..8255521 100644
--- a/packages/browser/src/utils/handleWebAuthnAuthentication.ts
+++ b/packages/browser/src/utils/handleWebAuthnAuthentication.ts
@@ -254,10 +254,10 @@ const handleWebAuthnAuthentication = async (challengeData: string): Promise<stri
 
         default:
           throw new ThunderIDRuntimeError(
-            `Passkey authentication failed: ${error.message}`,
+            'Passkey authentication failed. Please try again.',
             'browser-webauthn-general-error',
             'browser',
-            `WebAuthn authentication failed with error: ${error.name}`,
+            `WebAuthn authentication failed with error: ${error.name}: ${error.message}`,
           );
       }
     }
diff --git a/packages/react/src/utils/passkey.ts b/packages/react/src/utils/passkey.ts
index 2f7c8e8..25f2383 100644
--- a/packages/react/src/utils/passkey.ts
+++ b/packages/react/src/utils/passkey.ts
@@ -94,10 +94,10 @@ export const handlePasskeyRegistration = async (challengeData: string): Promise<
     if (error instanceof Error) {
       // Map specific WebAuthn errors to ThunderIDRuntimeError/friendly messages as needed
       throw new ThunderIDRuntimeError(
-        `Passkey registration failed: ${error.message}`,
+        'Passkey registration failed. Please try again.',
         'browser-webauthn-registration-error',
         'browser',
-        `WebAuthn registration failed with error: ${error.name}`,
+        `WebAuthn registration failed with error: ${error.name}: ${error.message}`,
       );
     }
 
@@ -182,10 +182,10 @@ export const handlePasskeyAuthentication = async (challengeData: string): Promis
 
     if (error instanceof Error) {
       throw new ThunderIDRuntimeError(
-        `Passkey authentication failed: ${error.message}`,
+        'Passkey authentication failed. Please try again.',
         'browser-webauthn-authentication-error',
         'browser',
-        `WebAuthn authentication failed with error: ${error.name}`,
+        `WebAuthn authentication failed with error: ${error.name}: ${error.message}`,
       );
     }
 
diff --git a/packages/vue/src/utils/passkey.ts b/packages/vue/src/utils/passkey.ts
index d8dbc4c..cf50e85 100644
--- a/packages/vue/src/utils/passkey.ts
+++ b/packages/vue/src/utils/passkey.ts
@@ -91,10 +91,10 @@ export const handlePasskeyRegistration = async (challengeData: string): Promise<
 
     if (error instanceof Error) {
       throw new ThunderIDRuntimeError(
-        `Passkey registration failed: ${error.message}`,
+        'Passkey registration failed. Please try again.',
         'browser-webauthn-registration-error',
         'browser',
-        `WebAuthn registration failed with error: ${error.name}`,
+        `WebAuthn registration failed with error: ${error.name}: ${error.message}`,
       );
     }
 
@@ -177,10 +177,10 @@ export const handlePasskeyAuthentication = async (challengeData: string): Promis
 
     if (error instanceof Error) {
       throw new ThunderIDRuntimeError(
-        `Passkey authentication failed: ${error.message}`,
+        'Passkey authentication failed. Please try again.',
         'browser-webauthn-authentication-error',
         'browser',
-        `WebAuthn authentication failed with error: ${error.name}`,
+        `WebAuthn authentication failed with error: ${error.name}: ${error.message}`,
       );
     }