diff --git a/app/models/user_option.rb b/app/models/user_option.rb
index e882e4ccf3f..828ac58c602 100644
--- a/app/models/user_option.rb
+++ b/app/models/user_option.rb
@@ -27,7 +27,7 @@ class UserOption < ActiveRecord::Base
     self.mailing_list_mode_frequency = SiteSetting.default_email_mailing_list_mode_frequency
     self.email_direct = SiteSetting.default_email_direct
     self.automatically_unpin_topics = SiteSetting.default_topics_automatic_unpin
-    self.email_private_messages = SiteSetting.default_email_private_messages
+    self.email_private_messages = SiteSetting.default_email_personal_messages
     self.email_previous_replies = SiteSetting.default_email_previous_replies
     self.email_in_reply_to = SiteSetting.default_email_in_reply_to
 
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index abc6465bd69..9c1e475b9cb 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1550,7 +1550,7 @@ en:
 
     default_email_digest_frequency: "How often users receive summary emails by default."
     default_include_tl0_in_digests: "Include posts from new users in summary emails by default. Users can change this in their preferences."
-    default_email_private_messages: "Send an email when someone messages the user by default."
+    default_email_personal_messages: "Send an email when someone messages the user by default."
     default_email_direct: "Send an email when someone quotes/replies to/mentions or invites the user by default."
     default_email_mailing_list_mode: "Send an email for every new post by default."
     default_email_mailing_list_mode_frequency: "Users who enable mailing list mode will receive emails this often by default."
diff --git a/config/site_settings.yml b/config/site_settings.yml
index d126cf303e9..51e324a3346 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1421,7 +1421,7 @@ user_preferences:
     enum: 'DigestEmailSiteSetting'
     default: 10080
   default_include_tl0_in_digests: false
-  default_email_private_messages: true
+  default_email_personal_messages: true
   default_email_direct: true
   default_email_mailing_list_mode: false
   default_email_mailing_list_mode_frequency:
diff --git a/db/migrate/20180131052859_rename_private_personal.rb b/db/migrate/20180131052859_rename_private_personal.rb
index 56f75d8510f..8a4edead629 100644
--- a/db/migrate/20180131052859_rename_private_personal.rb
+++ b/db/migrate/20180131052859_rename_private_personal.rb
@@ -11,14 +11,16 @@ class RenamePrivatePersonal < ActiveRecord::Migration[5.1]
     setting :enable_private_email_messages, :enable_personal_email_messages
     setting :private_email_time_window_seconds, :personal_email_time_window_seconds
     setting :max_private_messages_per_day, :max_personal_messages_per_day
+    setting :default_email_private_messages, :default_email_personal_messages
   end
 
   def down
-    setting :min_private_message_post_length, :min_personal_message_post_length
-    setting :min_private_message_title_length, :min_personal_message_title_length
-    setting :enable_private_messages, :enable_personal_messages
-    setting :enable_private_email_messages, :enable_personal_email_messages
-    setting :private_email_time_window_seconds, :personal_email_time_window_seconds
-    setting :max_private_messages_per_day, :max_personal_messages_per_day
+    setting :min_personal_message_post_length, :min_private_message_post_length
+    setting :min_personal_message_title_length, :min_private_message_title_length
+    setting :enable_personal_messages, :enable_private_messages
+    setting :enable_personal_email_messages, :enable_private_email_messages
+    setting :personal_email_time_window_seconds, :private_email_time_window_seconds
+    setting :max_personal_messages_per_day, :max_private_messages_per_day
+    setting :default_email_personal_messages, :default_email_private_messages
   end
 end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 164d121848b..8e95731065f 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1366,7 +1366,7 @@ describe User do
 
     before do
       SiteSetting.default_email_digest_frequency = 1440 # daily
-      SiteSetting.default_email_private_messages = false
+      SiteSetting.default_email_personal_messages = false
       SiteSetting.default_email_direct = false
       SiteSetting.default_email_mailing_list_mode = true
       SiteSetting.default_email_always = true