diff --git a/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
index 6a7094886bf..002eaba949f 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
@@ -14,7 +14,6 @@ export default Ember.Controller.extend(PreferencesTabController, {
       'enable_quoting',
       'disable_jump_reply',
       'automatically_unpin_topics',
-      'allow_private_messages',
     ];
 
     if (makeDefault) {
diff --git a/app/assets/javascripts/discourse/controllers/preferences/notifications.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/notifications.js.es6
index 8129641b5dc..bd9609b09a9 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/notifications.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/notifications.js.es6
@@ -10,7 +10,8 @@ export default Ember.Controller.extend(PreferencesTabController, {
     'new_topic_duration_minutes',
     'auto_track_topics_after_msecs',
     'notification_level_when_replying',
-    'like_notification_frequency'
+    'like_notification_frequency',
+    'allow_private_messages',
   ],
 
   @computed("model.watchedCategories", "model.trackedCategories", "model.mutedCategories")
diff --git a/app/assets/javascripts/discourse/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
index 5ea34031491..8e8d5852e90 100644
--- a/app/assets/javascripts/discourse/templates/preferences/interface.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
@@ -10,16 +10,6 @@
 </div>
 {{/if}}
 
-<div class="control-group private-messages">
-  <label class="control-label">{{i18n 'user.private_messages'}}</label>
-
-  <div class="controls">
-    {{preference-checkbox
-        labelKey="user.allow_private_messages"
-        checked=model.user_option.allow_private_messages}}
-  </div>
-</div>
-
 {{#if siteSettings.allow_user_locale}}
   <div class="control-group pref-locale">
     <label class="control-label">{{i18n 'user.locale.title'}}</label>
diff --git a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs b/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
index 0ddeefe9986..987a9c13863 100644
--- a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
@@ -26,6 +26,16 @@
   <div class="instructions">{{i18n 'user.desktop_notifications.each_browser_note'}}</div>
 </div>
 
+<div class="control-group private-messages">
+  <label class="control-label">{{i18n 'user.private_messages'}}</label>
+
+  <div class="controls">
+    {{preference-checkbox
+        labelKey="user.allow_private_messages"
+        checked=model.user_option.allow_private_messages}}
+  </div>
+</div>
+
 <div class="control-group muting">
   <label class="control-label">{{i18n 'user.users'}}</label>
   <div class="controls category-controls">