diff --git a/app/services/anonymous_shadow_creator.rb b/app/services/anonymous_shadow_creator.rb
index 3441455d8..2b9729dd6 100644
--- a/app/services/anonymous_shadow_creator.rb
+++ b/app/services/anonymous_shadow_creator.rb
@@ -33,7 +33,7 @@ class AnonymousShadowCreator
     User.transaction do
       shadow = User.create!(
         password: SecureRandom.hex,
-        email: "#{SecureRandom.hex}@#{SecureRandom.hex}.com",
+        email: "#{SecureRandom.hex}@anon.#{Discourse.current_hostname}.com",
         name: "",
         username: UserNameSuggester.suggest(I18n.t(:anonymous).downcase),
         active: true,