diff --git a/app/layouts/news/form-login.tsx b/app/layouts/news/form-login.tsx
index f00439f..a9463c1 100644
--- a/app/layouts/news/form-login.tsx
+++ b/app/layouts/news/form-login.tsx
@@ -1,5 +1,5 @@
 import { zodResolver } from '@hookform/resolvers/zod'
-import { useEffect } from 'react'
+import { useEffect, useState } from 'react'
 import { useFetcher } from 'react-router'
 import { RemixFormProvider, useRemixForm } from 'remix-hook-form'
 import { z } from 'zod'
@@ -30,6 +30,8 @@ export const FormLogin = (properties: TProperties) => {
     setIsInitSubscribeOpen,
   } = properties
   const fetcher = useFetcher()
+  const [error, setError] = useState<string>()
+  const [disabled, setDisabled] = useState(false)
 
   const formMethods = useRemixForm<TLoginSchema>({
     mode: 'onSubmit',
@@ -39,11 +41,21 @@ export const FormLogin = (properties: TProperties) => {
 
   const { handleSubmit } = formMethods
 
+  useEffect(() => {
+    if (fetcher.state !== 'idle' || fetcher.data?.success) {
+      setDisabled(true)
+      return
+    }
+    setDisabled(false)
+  }, [fetcher])
+
   useEffect(() => {
     if (fetcher.data?.success) {
       setIsInitSubscribeOpen(true)
       setIsLoginOpen(false)
+      return
     }
+    setError(fetcher.data?.message)
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [fetcher])
 
@@ -72,6 +84,10 @@ export const FormLogin = (properties: TProperties) => {
               type="password"
             />
 
+            {error && (
+              <div className="text-sm text-red-500 capitalize">{error}</div>
+            )}
+
             {/* Lupa Kata Sandi */}
             <div className="flex items-center justify-between text-sm">
               <span className="text-gray-600">Lupa Kata Sandi?</span>
@@ -89,6 +105,7 @@ export const FormLogin = (properties: TProperties) => {
 
             {/* Tombol Masuk */}
             <Button
+              disabled={disabled}
               type="submit"
               className="w-full rounded-md bg-[#2E2F7C] py-2 text-white transition hover:bg-blue-800"
             >
diff --git a/app/layouts/news/header-top.tsx b/app/layouts/news/header-top.tsx
index 12135ac..cb5507e 100644
--- a/app/layouts/news/header-top.tsx
+++ b/app/layouts/news/header-top.tsx
@@ -11,49 +11,47 @@ export const HeaderTop = () => {
   const fetcher = useFetcher()
 
   return (
-    <>
-      <div className="flex h-[60px] items-center justify-between bg-white px-5 align-middle sm:h-[100px] sm:gap-[15px] sm:px-[50px] sm:py-[20px]">
-        <Link
-          to="/news"
-          className="mt-2 h-full py-2"
-        >
-          <img
-            src={APP.logo}
-            alt={APP.title}
-            className="h-3/4 w-auto sm:h-full"
-          />
-        </Link>
-        <div className="hidden h-full items-center py-1.5 font-light whitespace-pre-line sm:flex">
-          {APP.description}
-        </div>
-        <div className="flex items-center gap-[15px]">
-          <Button className="h-8 w-auto rounded-none px-3 text-xs sm:h-[50px] sm:w-[150px] sm:text-lg">
-            About Us
-          </Button>
-          {loaderData?.userToken ? (
-            <fetcher.Form
-              method="POST"
-              action="/actions/news/logout"
-            >
-              <Button
-                variant="newsSecondary"
-                className="hidden sm:block"
-                type="submit"
-              >
-                Logout
-              </Button>
-            </fetcher.Form>
-          ) : (
+    <div className="flex h-[60px] items-center justify-between bg-white px-5 align-middle sm:h-[100px] sm:gap-[15px] sm:px-[50px] sm:py-[20px]">
+      <Link
+        to="/news"
+        className="mt-2 h-full py-2"
+      >
+        <img
+          src={APP.logo}
+          alt={APP.title}
+          className="h-3/4 w-auto sm:h-full"
+        />
+      </Link>
+      <div className="hidden h-full items-center py-1.5 font-light whitespace-pre-line sm:flex">
+        {APP.description}
+      </div>
+      <div className="flex items-center gap-[15px]">
+        <Button className="h-8 w-auto rounded-none px-3 text-xs sm:h-[50px] sm:w-[150px] sm:text-lg">
+          About Us
+        </Button>
+        {loaderData?.userToken ? (
+          <fetcher.Form
+            method="POST"
+            action="/actions/news/logout"
+          >
             <Button
               variant="newsSecondary"
               className="hidden sm:block"
-              onClick={() => setIsLoginOpen(true)}
+              type="submit"
             >
-              Masuk
+              Logout
             </Button>
-          )}
-        </div>
+          </fetcher.Form>
+        ) : (
+          <Button
+            variant="newsSecondary"
+            className="hidden sm:block"
+            onClick={() => setIsLoginOpen(true)}
+          >
+            Masuk
+          </Button>
+        )}
       </div>
-    </>
+    </div>
   )
 }
diff --git a/app/routes/actions.news.login.ts b/app/routes/actions.news.login.ts
index a49b9d7..12ee85e 100644
--- a/app/routes/actions.news.login.ts
+++ b/app/routes/actions.news.login.ts
@@ -37,7 +37,6 @@ export const action = async ({ request }: Route.ActionArgs) => {
     return data(
       {
         success: true,
-        accessToken: token,
       },
       {
         headers,