diff --git a/db/migrate/20160520000001_update_setting_no_auto_response.rb b/db/migrate/20160527000001_update_setting_no_auto_response.rb
similarity index 94%
rename from db/migrate/20160520000001_update_setting_no_auto_response.rb
rename to db/migrate/20160527000001_update_setting_no_auto_response.rb
index 1daf069dd..c36a9528c 100644
--- a/db/migrate/20160520000001_update_setting_no_auto_response.rb
+++ b/db/migrate/20160527000001_update_setting_no_auto_response.rb
@@ -16,7 +16,7 @@ class UpdateSettingNoAutoResponse < ActiveRecord::Migration
           },
         ],
       },
-      state: '(mailer-daemon|postmaster|abuse|root|noreply|noreply.+?)@.+?\..+?',
+      state: '(mailer-daemon|postmaster|abuse|root|noreply|noreply.+?|no-reply|no-reply.+?)@.+?\..+?',
       preferences: { online_service_disable: true },
       frontend: false
     )
diff --git a/db/seeds.rb b/db/seeds.rb
index a056e67c5..190b739e6 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1204,7 +1204,7 @@ Setting.create_if_not_exists(
       },
     ],
   },
-  state: '(mailer-daemon|postmaster|abuse|root|noreply|noreply.+?)@.+?\..+?',
+  state: '(mailer-daemon|postmaster|abuse|root|noreply|noreply.+?|no-reply|no-reply.+?)@.+?\..+?',
   preferences: { online_service_disable: true },
   frontend: false
 )