diff --git a/pages/users/login.js b/pages/users/login.js
index c3d8667..ec04670 100644
--- a/pages/users/login.js
+++ b/pages/users/login.js
@@ -46,7 +46,6 @@ function Login() {
   // TODO
   // eslint-disable-next-line no-unused-vars
   const router = useRouter();
-  const [formMessage, setFormMessage] = useState('');
   const [successOpen, setSuccessOpen] = useState(false);
   const [errorOpen, setErrorOpen] = useState(false);
 
@@ -69,10 +68,8 @@ function Login() {
   };
 
   const handleSubmit = async (values, setSubmitting) => {
-    setFormMessage('');
-
     if (await login(values.email, values.password)) {
-      setFormMessage('Success: Logging in. Please wait.');
+      setSuccessOpen(true);
       // router.push('/dashboard');
       //
       // TODO: Nextjs doesn't support Server side redirects
@@ -123,7 +120,7 @@ function Login() {
             id="form"
           >
             {({
-              submitForm, isSubmitting, values,
+              isSubmitting, values,
             }) => (
               <Form className={classes.form}>
                 <Grid container spacing={2}>
@@ -156,8 +153,8 @@ function Login() {
                   variant="contained"
                   color="primary"
                   className={classes.submit}
-                  onClick={submitForm}
                   disabled={isSubmitting}
+                  type="submit"
                 >
                   Login
                 </Button>
@@ -165,13 +162,6 @@ function Login() {
             )}
           </Formik>
 
-          {formMessage
-            && (
-            <Typography>
-              {formMessage}
-            </Typography>
-            )}
-
           <Link href="/users/signup">
             <Typography className={classes.login}>
               Don&#39;t have an account? Sign up now!
@@ -180,8 +170,20 @@ function Login() {
 
         </Container>
       </Paper>
-      <SnackAlert open={successOpen} onClose={handleSnackClose} severity="success" message="Success: Logging in. Please wait." />
-      <SnackAlert open={errorOpen} onClose={handleSnackClose} severity="error" message="Error: Email or password is invalid" />
+      <SnackAlert
+        open={successOpen}
+        onClose={handleSnackClose}
+        severity="success"
+        message="Success: Logging in. Please wait."
+        id="success-message"
+      />
+      <SnackAlert
+        open={errorOpen}
+        onClose={handleSnackClose}
+        severity="error"
+        message="Error: Email or password is invalid"
+        id="error-message"
+      />
     </Grid>
   );
 }
diff --git a/pages/users/signup.js b/pages/users/signup.js
index a63add1..2407363 100644
--- a/pages/users/signup.js
+++ b/pages/users/signup.js
@@ -125,7 +125,7 @@ function Signup() {
             validateOnChange={false}
             id="form"
           >
-            {({ values, submitForm, isSubmitting }) => (
+            {({ values, isSubmitting }) => (
               <Form className={classes.form}>
                 <Grid container spacing={2}>
                   <Grid item xs={12}>
@@ -169,8 +169,8 @@ function Signup() {
                   variant="contained"
                   color="primary"
                   className={classes.submit}
-                  onClick={submitForm}
                   disabled={isSubmitting}
+                  type="submit"
                 >
                   Sign Up
                 </Button>