diff --git a/app/assets/javascripts/discourse/templates/user/preferences.hbs b/app/assets/javascripts/discourse/templates/user/preferences.hbs
index a79116260..2644c964e 100644
--- a/app/assets/javascripts/discourse/templates/user/preferences.hbs
+++ b/app/assets/javascripts/discourse/templates/user/preferences.hbs
@@ -280,17 +280,17 @@
       <label class="control-label">{{i18n 'user.tag_settings'}}</label>
       <div class="controls tag-controls">
         <label><span class="icon fa fa-exclamation-circle watching"></span> {{i18n 'user.watched_tags'}}</label>
-        {{tag-chooser tags=model.watched_tags blacklist=selectedTags allowCreate=false placeholder=""}}
+        {{tag-chooser tags=model.watched_tags blacklist=selectedTags allowCreate=false placeholder="" everyTag="true" unlimitedTagCount="true"}}
       </div>
       <div class="instructions">{{i18n 'user.watched_tags_instructions'}}</div>
       <div class="controls tag-controls">
         <label><span class="icon fa fa-circle tracking"></span> {{i18n 'user.tracked_tags'}}</label>
-        {{tag-chooser tags=model.tracked_tags blacklist=selectedTags allowCreate=false placeholder=""}}
+        {{tag-chooser tags=model.tracked_tags blacklist=selectedTags allowCreate=false placeholder="" everyTag="true" unlimitedTagCount="true"}}
       </div>
       <div class="instructions">{{i18n 'user.tracked_tags_instructions'}}</div>
       <div class="controls tag-controls">
         <label><span class="icon fa fa-times-circle muted"></span> {{i18n 'user.muted_tags'}}</label>
-        {{tag-chooser tags=model.muted_tags blacklist=selectedTags allowCreate=false placeholder=""}}
+        {{tag-chooser tags=model.muted_tags blacklist=selectedTags allowCreate=false placeholder="" everyTag="true" unlimitedTagCount="true"}}
       </div>
       <div class="instructions">{{i18n 'user.muted_tags_instructions'}}</div>
     </div>