diff --git a/components/LoginModal/index.tsx b/components/LoginModal/index.tsx
index e5d3eda6..fac799ec 100644
--- a/components/LoginModal/index.tsx
+++ b/components/LoginModal/index.tsx
@@ -206,7 +206,10 @@ const LoginModal = (props: Props) => {
             ref={passwordInput}
           />
 
-          <Button text={t('modals.login.buttons.confirm')} />
+          <Button
+            disabled={!formValid}
+            text={t('modals.login.buttons.confirm')}
+          />
         </form>
       </DialogContent>
     </Dialog>
diff --git a/components/SignupModal/index.tsx b/components/SignupModal/index.tsx
index 4db64904..d8909927 100644
--- a/components/SignupModal/index.tsx
+++ b/components/SignupModal/index.tsx
@@ -315,7 +315,10 @@ const SignupModal = (props: Props) => {
             ref={passwordConfirmationInput}
           />
 
-          <Button text={t('modals.signup.buttons.confirm')} />
+          <Button
+            disabled={!formValid}
+            text={t('modals.signup.buttons.confirm')}
+          />
 
           <p className="terms">
             {/* <Trans i18nKey="modals.signup.agreement">