diff --git a/apps/web/app/not-found.tsx b/apps/web/app/not-found.tsx
index 95a9a8c97e..a3bfdee391 100644
--- a/apps/web/app/not-found.tsx
+++ b/apps/web/app/not-found.tsx
@@ -20,7 +20,22 @@ enum PageType {
 function getPageInfo(pathname: string, host: string) {
   const { isValidOrgDomain, currentOrgDomain } = getOrgDomainConfigFromHostname({ hostname: host });
   const [routerUsername] = pathname?.replace("%20", "-").split(/[?#]/) ?? [];
-  if (!routerUsername || (isValidOrgDomain && currentOrgDomain)) {
+  if (routerUsername && (!isValidOrgDomain || !currentOrgDomain)) {
+    const splitPath = routerUsername.split("/");
+    if (splitPath[1] === "team" && splitPath.length === 3) {
+      return {
+        username: splitPath[2],
+        pageType: PageType.TEAM,
+        url: `${WEBSITE_URL}/signup?callbackUrl=settings/teams/new%3Fslug%3D${splitPath[2].replace("/", "")}`,
+      };
+    } else {
+      return {
+        username: routerUsername,
+        pageType: PageType.USER,
+        url: `${WEBSITE_URL}/signup?username=${routerUsername.replace("/", "")}`,
+      };
+    }
+  } else {
     return {
       username: currentOrgDomain ?? "",
       pageType: PageType.ORG,
@@ -29,21 +44,6 @@ function getPageInfo(pathname: string, host: string) {
       }`,
     };
   }
-
-  const splitPath = routerUsername.split("/");
-  if (splitPath[1] === "team" && splitPath.length === 3) {
-    return {
-      username: splitPath[2],
-      pageType: PageType.TEAM,
-      url: `${WEBSITE_URL}/signup?callbackUrl=settings/teams/new%3Fslug%3D${splitPath[2].replace("/", "")}`,
-    };
-  }
-
-  return {
-    username: routerUsername,
-    pageType: PageType.USER,
-    url: `${WEBSITE_URL}/signup?username=${routerUsername.replace("/", "")}`,
-  };
 }
 
 async function NotFound() {
@@ -126,7 +126,8 @@ async function NotFound() {
 
               {username ? (
                 <>
-                  <strong className="text-blue-500">{username}</strong> {t("is_still_available")}{" "}
+                  <strong className="text-blue-500">{username}</strong>
+                  {` ${t("is_still_available")} `}
                   <span className="text-blue-500">{t("register_now")}</span>.
                 </>
               ) : null}