diff --git a/cloudformation/cognito-selfserve.yml b/cloudformation/cognito-selfserve.yml
index fdcd2bc..fac6311 100644
--- a/cloudformation/cognito-selfserve.yml
+++ b/cloudformation/cognito-selfserve.yml
@@ -52,8 +52,6 @@ Resources:
           Enter this code on the registration page to complete sign-up. If
           you didn't request this account, no action is needed and the
           account will not be created.
-
-          (If you don't see this in your inbox, please check Spam / Junk.)
       Schema:
         - Name: email
           AttributeDataType: String
diff --git a/frontends/mdr-frontend/src/pages/Login.tsx b/frontends/mdr-frontend/src/pages/Login.tsx
index 3f72127..f223fad 100644
--- a/frontends/mdr-frontend/src/pages/Login.tsx
+++ b/frontends/mdr-frontend/src/pages/Login.tsx
@@ -89,14 +89,29 @@ const Login: React.FC = () => {
           )}
 
           {isCognitoEnabled ? (
-            <Button
-              size="3"
-              className="w-full"
-              disabled={isLoading}
-              onClick={handleCognitoLogin}
-            >
-              {isLoading ? "Redirecting..." : "Sign In / Register"}
-            </Button>
+            <>
+              <Button
+                size="3"
+                className="w-full"
+                disabled={isLoading}
+                onClick={handleCognitoLogin}
+              >
+                {isLoading ? "Redirecting..." : "Sign In / Register"}
+              </Button>
+              {/* The Cognito hosted UI sign-up flow emails a 6-digit code,
+                  and Cognito's default sender domain
+                  (no-reply@verificationemail.com) often hits Gmail / Outlook
+                  spam filters. Surface the spam-folder reminder *here* — at
+                  the moment the user is about to bounce to Cognito to sign
+                  up and is about to be waiting for that code — rather than
+                  inside the email body itself, where it's redundant if they
+                  see the mail and useless if they don't. Issue #948 (@cbeach47
+                  review of #946). */}
+              <Text size="1" color="gray" align="center" mt="1">
+                If you're registering, you'll receive a 6-digit code by email.
+                Check your Spam folder if it doesn't arrive within a minute.
+              </Text>
+            </>
           ) : (
             <form onSubmit={handleLegacySubmit}>
               <Flex direction="column" gap="3">