diff --git a/autogpt_platform/frontend/src/app/(platform)/login/page.tsx b/autogpt_platform/frontend/src/app/(platform)/login/page.tsx
index 629854c4d597..645635f51a8d 100644
--- a/autogpt_platform/frontend/src/app/(platform)/login/page.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/login/page.tsx
@@ -149,6 +149,7 @@ export default function LoginPage() {
           </AuthButton>
         </form>
         <AuthFeedback
+          type="login"
           message={feedback}
           isError={!!feedback}
           behaveAs={getBehaveAs()}
diff --git a/autogpt_platform/frontend/src/app/(platform)/reset_password/page.tsx b/autogpt_platform/frontend/src/app/(platform)/reset_password/page.tsx
index 3c78718a722c..bfd0178739b5 100644
--- a/autogpt_platform/frontend/src/app/(platform)/reset_password/page.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/reset_password/page.tsx
@@ -153,6 +153,7 @@ export default function ResetPasswordPage() {
                 Update password
               </AuthButton>
               <AuthFeedback
+                type="login"
                 message={feedback}
                 isError={isError}
                 behaveAs={getBehaveAs()}
@@ -184,6 +185,7 @@ export default function ResetPasswordPage() {
                 Send reset email
               </AuthButton>
               <AuthFeedback
+                type="login"
                 message={feedback}
                 isError={isError}
                 behaveAs={getBehaveAs()}
diff --git a/autogpt_platform/frontend/src/app/(platform)/signup/page.tsx b/autogpt_platform/frontend/src/app/(platform)/signup/page.tsx
index 10b59b5c9f0c..127b1d1f15e3 100644
--- a/autogpt_platform/frontend/src/app/(platform)/signup/page.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/signup/page.tsx
@@ -90,7 +90,7 @@ export default function SignupPage() {
   }
 
   return (
-    <AuthCard className="mx-auto">
+    <AuthCard className="mx-auto mt-12">
       <AuthHeader>Create a new account</AuthHeader>
       <Form {...form}>
         <form onSubmit={form.handleSubmit(onSignup)}>
@@ -188,6 +188,7 @@ export default function SignupPage() {
         </form>
       </Form>
       <AuthFeedback
+        type="signup"
         message={feedback}
         isError={!!feedback}
         behaveAs={getBehaveAs()}
diff --git a/autogpt_platform/frontend/src/components/auth/AuthFeedback.tsx b/autogpt_platform/frontend/src/components/auth/AuthFeedback.tsx
index 835ed118dda4..3b518b4e096f 100644
--- a/autogpt_platform/frontend/src/components/auth/AuthFeedback.tsx
+++ b/autogpt_platform/frontend/src/components/auth/AuthFeedback.tsx
@@ -1,16 +1,17 @@
 import { AlertCircle, CheckCircle } from "lucide-react";
-import { Card, CardContent } from "@/components/ui/card";
+import { Card, CardContent, CardHeader } from "@/components/ui/card";
 import { HelpItem } from "@/components/auth/help-item";
-import Link from "next/link";
 import { BehaveAs } from "@/lib/utils";
 
 interface Props {
+  type: "login" | "signup";
   message?: string | null;
   isError?: boolean;
   behaveAs?: BehaveAs;
 }
 
 export default function AuthFeedback({
+  type,
   message = "",
   isError = false,
   behaveAs = BehaveAs.CLOUD,
@@ -39,48 +40,45 @@ export default function AuthFeedback({
       )}
 
       {/* Cloud-specific help */}
-      {isError && behaveAs === BehaveAs.CLOUD && (
-        <div className="mt-2 space-y-2 text-sm">
-          <span className="block text-center font-medium text-red-500">
-            The provided email may not be allowed to sign up.
-          </span>
-          <ul className="space-y-2 text-slate-700">
-            <li className="flex items-start">
-              <span className="mr-2">-</span>
-              <span>
-                AutoGPT Platform is currently in closed beta. You can join{" "}
-                <Link
+      {isError &&
+        behaveAs === BehaveAs.CLOUD &&
+        (type === "signup" ? (
+          <Card className="overflow-hidden rounded-lg border border-slate-200 bg-white shadow-sm">
+            <CardContent className="p-0">
+              <div className="divide-y divide-slate-100">
+                <span className="my-3 block text-center text-sm font-medium text-red-500">
+                  The provided email may not be allowed to sign up.
+                </span>
+                <HelpItem
+                  title="AutoGPT Platform is currently in closed beta. "
+                  description="You can join "
+                  linkText="the waitlist here"
                   href="https://agpt.co/waitlist"
-                  className="font-medium text-slate-950 underline hover:text-slate-700"
-                >
-                  the waitlist here
-                </Link>
-                .
-              </span>
-            </li>
-            <li className="flex items-start">
-              <span className="mr-2">-</span>
-              <span>
-                Make sure you use the same email address you used to sign up for
-                the waitlist.
-              </span>
-            </li>
-            <li className="flex items-start">
-              <span className="mr-2">-</span>
-              <span>
-                You can self host the platform, visit our{" "}
-                <Link
+                />
+                <HelpItem title="Make sure you use the same email address you used to sign up for the waitlist." />
+                <HelpItem
+                  title="You can self host the platform!"
+                  description="Visit our"
+                  linkText="GitHub repository"
                   href="https://github.com/Significant-Gravitas/AutoGPT"
-                  className="font-medium text-slate-950 underline hover:text-slate-700"
-                >
-                  GitHub repository
-                </Link>
-                .
-              </span>
-            </li>
-          </ul>
-        </div>
-      )}
+                />
+              </div>
+            </CardContent>
+          </Card>
+        ) : (
+          <Card className="overflow-hidden rounded-lg border border-slate-200 bg-white shadow-sm">
+            <CardContent className="p-0">
+              <div className="divide-y divide-slate-100">
+                <HelpItem
+                  title="Having trouble logging in?"
+                  description="Make sure you've already "
+                  linkText="signed up"
+                  href="/signup"
+                />
+              </div>
+            </CardContent>
+          </Card>
+        ))}
 
       {/* Local-specific help */}
       {isError && behaveAs === BehaveAs.LOCAL && (
diff --git a/autogpt_platform/frontend/src/components/auth/help-item.tsx b/autogpt_platform/frontend/src/components/auth/help-item.tsx
index 12c791fe4459..51f4fef37a0b 100644
--- a/autogpt_platform/frontend/src/components/auth/help-item.tsx
+++ b/autogpt_platform/frontend/src/components/auth/help-item.tsx
@@ -3,29 +3,33 @@ import Link from "next/link";
 
 interface HelpItemProps {
   title: string;
-  description: string;
-  linkText: string;
-  href: string;
+  description?: string;
+  linkText?: string;
+  href?: string;
 }
 
 export function HelpItem({
   title,
   description,
   linkText,
-  href,
+  href = "",
 }: HelpItemProps) {
+  const external = !href.startsWith("/");
+
   return (
     <div className="p-4">
       <h3 className="mb-1 text-sm font-medium text-slate-950">{title}</h3>
       <p className="text-sm text-slate-600">
         {description}{" "}
-        <Link
-          href={href}
-          className="inline-flex items-center font-medium text-slate-950 hover:text-slate-700"
-        >
-          {linkText}
-          <ExternalLink className="ml-1 h-3 w-3" />
-        </Link>
+        {linkText && (
+          <Link
+            href={href}
+            className="inline-flex items-center font-medium text-slate-950 hover:text-slate-700"
+          >
+            {linkText}
+            {external && <ExternalLink className="ml-1 h-3 w-3" />}
+          </Link>
+        )}
       </p>
     </div>
   );