diff --git a/packages/keychain/src/components/connect/Signup.tsx b/packages/keychain/src/components/connect/Signup.tsx
index e10d3a7d1..587dc092a 100644
--- a/packages/keychain/src/components/connect/Signup.tsx
+++ b/packages/keychain/src/components/connect/Signup.tsx
@@ -141,21 +141,25 @@ function Form({
               autoFocus
               placeholder="Username"
               touched={meta.touched}
-              error={meta.error}
+              error={meta.error || error?.message}
               onClear={() => form.setFieldValue(field.name, "")}
               isLoading={isValidating}
             />
           )}
         </FormikField>
-
-        <ErrorComp error={error} />
       </Content>
 
       <Footer isSlot={isSlot} createSession showTerm>
         <Button
           colorScheme="colorful"
           isLoading={isRegistering}
-          onClick={() => {
+          onClick={async () => {
+            const error = await validateUsernameFor("signup")(values.username);
+            if (error) {
+              setError(new Error(error));
+              return;
+            }
+
             setIsRegistering(true);
 
             const searchParams = new URLSearchParams(window.location.search);