diff --git a/frontend/pages/login.tsx b/frontend/pages/login.tsx
index ef9b7a7d6..25fc85a9f 100644
--- a/frontend/pages/login.tsx
+++ b/frontend/pages/login.tsx
@@ -38,6 +38,10 @@ export default function Login() {
    * This function check if the user entered the correct credentials and should be allowed to log in.
    */
   const loginCheck = async () => {
+    if (!email || !password) {
+      return;
+    }
+
     setIsLoading(true);
     await attemptLogin(
       email,
@@ -75,9 +79,11 @@ export default function Login() {
           />
         </div>
       </Link>
-      <form onSubmit={(e)=>{
-        e.preventDefault()
-      }}>
+      <form
+        onChange={() => setErrorLogin(false)} onSubmit={(e) => {
+        e.preventDefault();
+      }}
+      >
         <div className="bg-bunker w-full max-w-md mx-auto h-7/12 py-4 pt-8 px-6 rounded-xl drop-shadow-xl">
           <p className="text-3xl w-max mx-auto flex justify-center font-semibold text-bunker-100 mb-6">
             Log in to your account