diff --git a/apps/web/src/components/dialogs/logindialog.js b/apps/web/src/components/dialogs/logindialog.js
index e1cb0ff80..a69966950 100644
--- a/apps/web/src/components/dialogs/logindialog.js
+++ b/apps/web/src/components/dialogs/logindialog.js
@@ -8,12 +8,12 @@ import { useStore } from "../../stores/user-store";
 import PasswordInput from "../inputs/password";
 import Dropper from "../dropper";
 
+const form = { error: true };
 function LoginDialog(props) {
   const { onClose } = props;
   const [error, setError] = useState();
   const isLoggingIn = useStore((store) => store.isLoggingIn);
   const login = useStore((store) => store.login);
-  const form = { error: true };
 
   return (
     <Dialog
@@ -51,6 +51,7 @@ function LoginDialog(props) {
 function submit(setError, form, login, onClose) {
   setError();
   if (form.error) return;
+
   login(form)
     .then(onClose)
     .catch((e) => setError(e.message));
diff --git a/apps/web/src/components/dialogs/signupdialog.js b/apps/web/src/components/dialogs/signupdialog.js
index be6494d79..28b376497 100644
--- a/apps/web/src/components/dialogs/signupdialog.js
+++ b/apps/web/src/components/dialogs/signupdialog.js
@@ -9,12 +9,12 @@ import PasswordInput from "../inputs/password";
 import Dropper from "../dropper";
 import { useStore } from "../../stores/user-store";
 
+const form = { error: true };
 function SignUpDialog(props) {
   const { onClose } = props;
   const [error, setError] = useState();
   const isSigningIn = useStore((store) => store.isSigningIn);
   const signup = useStore((store) => store.signup);
-  const form = { error: true };
 
   return (
     <Dialog
@@ -49,6 +49,10 @@ function SignUpDialog(props) {
 
 function submit(setError, form, signup, onClose) {
   setError();
+  if (form.password !== form.confirm) {
+    form.error = true;
+    setError("Passwords do not match.");
+  }
   if (form.error) return;
   signup(form)
     .then(onClose)
diff --git a/apps/web/src/components/inputs/password.js b/apps/web/src/components/inputs/password.js
index 98fba9bdb..7ce72b11f 100644
--- a/apps/web/src/components/inputs/password.js
+++ b/apps/web/src/components/inputs/password.js
@@ -12,7 +12,10 @@ function PasswordInput(props) {
           title="Confirm Password"
           type="password"
           error="Passwords do not match"
-          validate={(password, form) => form.password === password}
+          name="confirm"
+          validate={(password, form) =>
+            !form.password || form.password === password
+          }
         />
       )}
     </Dropper>