diff --git a/bin/core/src/api/auth.rs b/bin/core/src/api/auth.rs
index 707379cdd..d5a7ac563 100644
--- a/bin/core/src/api/auth.rs
+++ b/bin/core/src/api/auth.rs
@@ -4,9 +4,10 @@ use anyhow::anyhow;
 use axum::{http::HeaderMap, routing::post, Router};
 use axum_extra::{headers::ContentType, TypedHeader};
 use komodo_client::{api::auth::*, entities::user::User};
+use reqwest::StatusCode;
 use resolver_api::{derive::Resolver, Resolve, Resolver};
 use serde::{Deserialize, Serialize};
-use serror::Json;
+use serror::{AddStatusCode, Json};
 use typeshare::typeshare;
 use uuid::Uuid;
 
@@ -70,7 +71,10 @@ async fn handler(
   }
   let elapsed = timer.elapsed();
   debug!("/auth request {req_id} | resolve time: {elapsed:?}");
-  Ok((TypedHeader(ContentType::json()), res?))
+  Ok((
+    TypedHeader(ContentType::json()),
+    res.status_code(StatusCode::UNAUTHORIZED)?,
+  ))
 }
 
 fn login_options_reponse() -> &'static GetLoginOptionsResponse {
diff --git a/frontend/src/pages/login.tsx b/frontend/src/pages/login.tsx
index 4ab528870..da58c9c1c 100644
--- a/frontend/src/pages/login.tsx
+++ b/frontend/src/pages/login.tsx
@@ -15,6 +15,7 @@ import { ThemeToggle } from "@ui/theme";
 import { AUTH_TOKEN_STORAGE_KEY, KOMODO_BASE_URL } from "@main";
 import { Loader2, X } from "lucide-react";
 import { cn } from "@lib/utils";
+import { useToast } from "@ui/use-toast";
 
 type OauthProvider = "Github" | "Google";
 
@@ -62,10 +63,10 @@ const useExchangeToken = () => {
 };
 
 export const Login = () => {
-  // const exchange_token =
   const options = useLoginOptions().data;
   const [creds, set] = useState({ username: "", password: "" });
   const userInvalidate = useUserInvalidate();
+  const { toast } = useToast();
   const onSuccess = ({ jwt }: { jwt: string }) => {
     localStorage.setItem(AUTH_TOKEN_STORAGE_KEY, jwt);
     userInvalidate();
@@ -74,10 +75,42 @@ export const Login = () => {
     "CreateLocalUser",
     {
       onSuccess,
+      onError: (e: any) => {
+        const message = e?.response?.data?.error as string | undefined;
+        if (message) {
+          toast({
+            title: `Failed to login user. '${message}'`,
+            variant: "destructive",
+          });
+          console.error(e);
+        } else {
+          toast({
+            title: "Failed to login user. See console log for details.",
+            variant: "destructive",
+          });
+          console.error(e);
+        }
+      },
     }
   );
   const { mutate: login, isPending: loginPending } = useAuth("LoginLocalUser", {
     onSuccess,
+    onError: (e: any) => {
+      const message = e?.response?.data?.error as string | undefined;
+      if (message) {
+        toast({
+          title: `Failed to login user. '${message}'`,
+          variant: "destructive",
+        });
+        console.error(e);
+      } else {
+        toast({
+          title: "Failed to login user. See console log for details.",
+          variant: "destructive",
+        });
+        console.error(e);
+      }
+    },
   });
 
   // Handle exchange token loop to avoid showing login flash