diff --git a/.gitignore b/.gitignore
index 4d29575..6e8f746 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
 # dependencies
+.env
 /node_modules
 /.pnp
 .pnp.js
diff --git a/src/components/Login.js b/src/components/Login.js
index 53ec8b7..0541b28 100644
--- a/src/components/Login.js
+++ b/src/components/Login.js
@@ -18,12 +18,12 @@ export default function Login() {
       setError("")
       setLoading(true)
       await login(emailRef.current.value, passwordRef.current.value)
+      setLoading(false)
       history.push("/")
     } catch {
+      setLoading(false)
       setError("Failed to log in")
     }
-
-    setLoading(false)
   }
 
   return (
@@ -54,5 +54,5 @@ export default function Login() {
         Need an account? <Link to="/signup">Sign Up</Link>
       </div>
     </>
-  )
+  
 }
diff --git a/src/components/Signup.js b/src/components/Signup.js
index 546b77b..eda657c 100644
--- a/src/components/Signup.js
+++ b/src/components/Signup.js
@@ -23,12 +23,12 @@ export default function Signup() {
       setError("")
       setLoading(true)
       await signup(emailRef.current.value, passwordRef.current.value)
+      setLoading(false)
       history.push("/")
     } catch {
+      setLoading(false)
       setError("Failed to create an account")
     }
-
-    setLoading(false)
   }
 
   return (