diff --git a/apps/web/pages/signup.tsx b/apps/web/pages/signup.tsx
index dc1694222e..dc499a16e7 100644
--- a/apps/web/pages/signup.tsx
+++ b/apps/web/pages/signup.tsx
@@ -321,15 +321,6 @@ export default function Signup({
           <HeadSeo title={t("sign_up")} description={t("sign_up")} />
           {/* Left side */}
           <div className="ml-auto mr-auto mt-0 flex w-full max-w-xl flex-col px-4 pt-6 sm:px-16 md:px-20 lg:mt-12 2xl:px-28">
-            {/* Header */}
-            {errors.apiError && (
-              <Alert
-                className="mb-3"
-                severity="error"
-                message={errors.apiError?.message}
-                data-testid="signup-error-message"
-              />
-            )}
             <div className="flex flex-col gap-2">
               <h1 className="font-cal text-[28px] leading-none ">
                 {IS_CALCOM ? t("create_your_calcom_account") : t("create_your_account")}
@@ -408,6 +399,14 @@ export default function Signup({
                   onChange={() => handleConsentChange(COOKIE_CONSENT)}
                   description={t("cookie_consent_checkbox")}
                 />
+                {errors.apiError && (
+                  <Alert
+                    className="mb-3"
+                    severity="error"
+                    message={errors.apiError?.message}
+                    data-testid="signup-error-message"
+                  />
+                )}
                 <Button
                   type="submit"
                   className="my-2 w-full justify-center"
diff --git a/packages/lib/server/username.ts b/packages/lib/server/username.ts
index b4a01bc580..79ed40cf0b 100644
--- a/packages/lib/server/username.ts
+++ b/packages/lib/server/username.ts
@@ -78,7 +78,7 @@ const processResult = (
     case "username_exists":
       return {
         statusCode: 418,
-        message: "A user exists with that username",
+        message: "A user exists with that username or email",
       };
     case "is_premium":
       return { statusCode: 402, message: "This is a premium username." };