diff --git a/components/SignupModal/index.tsx b/components/SignupModal/index.tsx
index a8846752..75179fa5 100644
--- a/components/SignupModal/index.tsx
+++ b/components/SignupModal/index.tsx
@@ -124,6 +124,12 @@ const SignupModal = (props: Props) => {
                     : 'That email address is not valid'
                 break
 
+            case 'password':
+                newErrors.password = passwordInput.current?.value.includes(usernameInput.current?.value!)
+                    ? 'Your password should not contain your username'
+                    : ''
+                break
+
             case 'password':
                 newErrors.password = value.length < 8
                     ? 'Password must be at least 8 characters'