diff --git a/packages/web/lib/networking/queries/useValidateUsernameQuery.tsx b/packages/web/lib/networking/queries/useValidateUsernameQuery.tsx
index 8df55571b..c40dd9fc0 100644
--- a/packages/web/lib/networking/queries/useValidateUsernameQuery.tsx
+++ b/packages/web/lib/networking/queries/useValidateUsernameQuery.tsx
@@ -24,8 +24,12 @@ export function useValidateUsernameQuery({
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const isUsernameValid = (data as any)?.validateUsername ?? false
-  const usernameErrorMessage = validationErrorMessage(username)
+  if (isUsernameValid) {
+    return { isUsernameValid }
+  }
 
+  // Try to figure out why the username is invalid
+  const usernameErrorMessage = validationErrorMessage(username.toLowerCase())
   if (usernameErrorMessage) {
     return {
       isUsernameValid: false,
@@ -33,10 +37,6 @@ export function useValidateUsernameQuery({
     }
   }
 
-  if (isUsernameValid) {
-    return { isUsernameValid }
-  }
-
   return {
     isUsernameValid: false,
     usernameErrorMessage: 'This username is not available',