diff --git a/src/routes/login/+page.server.ts b/src/routes/login/+page.server.ts
index 2d737d3..135b165 100644
--- a/src/routes/login/+page.server.ts
+++ b/src/routes/login/+page.server.ts
@@ -54,13 +54,8 @@ export const actions = {
         });
       }
     } catch (e) {
-      if ((e as APIError).body.code === 'INVALID_EMAIL_OR_PASSWORD') {
-        return setError(form, 'password', 'Invalid email or password', {
-          status: 401,
-        });
-      } else {
-        return setError(form, 'password', (e as APIError).message as string);
-      }
+      const errorMessage = (e as APIError).body.message as string;
+      return setError(form, 'password', errorMessage.charAt(0).toUpperCase() + errorMessage.slice(1));
     }
 
     return message(form, 'Successfuly signed in.');
diff --git a/src/routes/signup/+page.server.ts b/src/routes/signup/+page.server.ts
index 1fcfa19..43a07e4 100644
--- a/src/routes/signup/+page.server.ts
+++ b/src/routes/signup/+page.server.ts
@@ -57,7 +57,8 @@ export const actions = {
         });
       }
     } catch (e) {
-      return setError(form, 'verify', (e as APIError).message as string);
+      const errorMessage = (e as APIError).body.message as string;
+      return setError(form, 'verify', errorMessage.charAt(0).toUpperCase() + errorMessage.slice(1));
     }
 
     return message(form, 'Successfuly signed in.');