diff --git a/app/assets/javascripts/discourse/controllers/preferences.js.es6 b/app/assets/javascripts/discourse/controllers/preferences.js.es6
index 07120a7c849..7b5810ff30f 100644
--- a/app/assets/javascripts/discourse/controllers/preferences.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences.js.es6
@@ -67,7 +67,7 @@ export default ObjectController.extend(CanCheckEmails, {
                       { name: I18n.t('user.email_digests.every_two_weeks'), value: 14 }],
 
   autoTrackDurations: [{ name: I18n.t('user.auto_track_options.never'), value: -1 },
-                       { name: I18n.t('user.auto_track_options.always'), value: 0 },
+                       { name: I18n.t('user.auto_track_options.immediately'), value: 0 },
                        { name: I18n.t('user.auto_track_options.after_n_seconds', { count: 30 }), value: 30000 },
                        { name: I18n.t('user.auto_track_options.after_n_minutes', { count: 1 }), value: 60000 },
                        { name: I18n.t('user.auto_track_options.after_n_minutes', { count: 2 }), value: 120000 },
diff --git a/app/assets/javascripts/discourse/templates/user/preferences.hbs b/app/assets/javascripts/discourse/templates/user/preferences.hbs
index d8e5ff1e2b9..0133f6537bb 100644
--- a/app/assets/javascripts/discourse/templates/user/preferences.hbs
+++ b/app/assets/javascripts/discourse/templates/user/preferences.hbs
@@ -197,16 +197,17 @@
 
     <div class="control-group other">
       <label class="control-label">{{i18n 'user.other_settings'}}</label>
-      <div class="controls controls-dropdown">
-        <label>{{i18n 'user.auto_track_topics'}}</label>
-        {{combo-box valueAttribute="value" content=autoTrackDurations value=auto_track_topics_after_msecs}}
-      </div>
 
       <div class="controls controls-dropdown">
         <label>{{i18n 'user.new_topic_duration.label'}}</label>
         {{combo-box valueAttribute="value" content=considerNewTopicOptions value=new_topic_duration_minutes}}
       </div>
 
+      <div class="controls controls-dropdown">
+        <label>{{i18n 'user.auto_track_topics'}}</label>
+        {{combo-box valueAttribute="value" content=autoTrackDurations value=auto_track_topics_after_msecs}}
+      </div>
+
       {{preference-checkbox labelKey="user.external_links_in_new_tab" checked=external_links_in_new_tab}}
       {{preference-checkbox labelKey="user.enable_quoting" checked=enable_quoting}}
       {{preference-checkbox labelKey="user.dynamic_favicon" checked=dynamic_favicon}}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index c2d95b258ef..7ca4043164b 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -509,7 +509,7 @@ en:
       auto_track_topics: "Automatically track topics I enter"
       auto_track_options:
         never: "never"
-        always: "always"
+        immediately: "immediately"
         after_n_seconds:
           one: "after 1 second"
           other: "after {{count}} seconds"