diff --git a/app/views/identities/new.html.erb b/app/views/identities/new.html.erb
index 68ff3936..71f5867a 100644
--- a/app/views/identities/new.html.erb
+++ b/app/views/identities/new.html.erb
@@ -105,6 +105,9 @@
         </div>
         <small id="emailHelp">
           <%= t ".email_code" %>
+          <% if @onboarding_scenario.form_fields.include?(:primary_email) && @identity.primary_email.blank? %>
+            <br><%= t ".email_public_warning" %>
+          <% end %>
           <% if @onboarding_scenario.is_a?(OnboardingScenarios::LegacyMigration) %>
             <br>This needs to be the same email your Slack account is registered under.
           <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 86486e6d..56fb5f37 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -407,6 +407,7 @@ en:
       log_in: Log in here
       not_necessarily_legal_name: not necessarily your legal name, what do people usually call you?
       email_code: We'll send a one-time code to this address.
+      email_public_warning: Heads up! Your email address is visible to other people on the Slack
       continue: Continue
       wrong_email: "← Wrong email? Go back"
     update: