diff --git a/ui/app/styles/helper-classes/spacing.scss b/ui/app/styles/helper-classes/spacing.scss
index a208705622a7..8d95939e537f 100644
--- a/ui/app/styles/helper-classes/spacing.scss
+++ b/ui/app/styles/helper-classes/spacing.scss
@@ -98,6 +98,10 @@
   margin: $spacing-4 0;
 }
 
+.has-top-margin-negative-m {
+  margin-top: -$spacing-16;
+}
+
 .has-top-bottom-margin-negative-m {
   margin-top: -$spacing-16;
   margin-bottom: -$spacing-16;
diff --git a/ui/lib/config-ui/addon/components/messages/page/create-and-edit-message-form.hbs b/ui/lib/config-ui/addon/components/messages/page/create-and-edit-message-form.hbs
index cd77066f0df8..c687f1822fd1 100644
--- a/ui/lib/config-ui/addon/components/messages/page/create-and-edit-message-form.hbs
+++ b/ui/lib/config-ui/addon/components/messages/page/create-and-edit-message-form.hbs
@@ -21,6 +21,11 @@
       <FormField @attr={{attr}} @model={{@message}} @modelValidations={{this.modelValidations}} class="has-bottom-margin-m">
         <Messages::MessageExpirationDateForm @message={{@message}} @attr={{attr}} />
       </FormField>
+      {{#if (and (eq attr.name "message") (not @message.authenticated))}}
+        <Hds::Alert class="has-top-margin-negative-m has-bottom-margin-l" @type="compact" @color="highlight" as |A|>
+          <A.Description>Note: Do not include sensitive info in this message since users are unauthenticated at this stage.</A.Description>
+        </Hds::Alert>
+      {{/if}}
     {{/each}}
 
     <Hds::ButtonSet class="has-top-margin-s has-bottom-margin-m has-top-margin-xl">