diff --git a/static/js/settings.js b/static/js/settings.js
index e5843752d2..03e0d93e63 100644
--- a/static/js/settings.js
+++ b/static/js/settings.js
@@ -126,7 +126,7 @@ export function build_page() {
         user_role_text: people.get_user_type(page_params.user_id),
         default_language_name: settings_display.default_language_name,
         language_list_dbl_col: get_language_list_columns(user_settings.default_language),
-        user_settings,
+        settings_object: user_settings,
     });
 
     $(".settings-box").html(rendered_settings_tab);
diff --git a/static/templates/settings/account_settings.hbs b/static/templates/settings/account_settings.hbs
index 65f93217b1..f20b6ad5a6 100644
--- a/static/templates/settings/account_settings.hbs
+++ b/static/templates/settings/account_settings.hbs
@@ -101,7 +101,7 @@
             <div class="input-group">
                 {{> settings_checkbox
                   setting_name="presence_enabled"
-                  is_checked=user_settings.presence_enabled
+                  is_checked=settings_object.presence_enabled
                   label=settings_label.presence_enabled
                   help_link="/help/status-and-availability"
                   prefix="user_"}}
diff --git a/static/templates/settings/display_settings.hbs b/static/templates/settings/display_settings.hbs
index 15dcdb6f2a..1a175f7f0d 100644
--- a/static/templates/settings/display_settings.hbs
+++ b/static/templates/settings/display_settings.hbs
@@ -42,7 +42,7 @@
         {{#each display_settings.settings.user_display_settings}}
         {{> settings_checkbox
           setting_name=this
-          is_checked=(lookup ../user_settings this)
+          is_checked=(lookup ../settings_object this)
           label=(lookup ../settings_label this)
           render_only=(lookup ../display_settings.render_only this)
           prefix=../prefix}}
@@ -80,7 +80,7 @@
 
         <div class="input-group">
             <div class="emojiset_choices grey-box">
-                {{#each user_settings.emojiset_choices}}
+                {{#each settings_object.emojiset_choices}}
                 <label>
                     <input type="radio" class="setting_emojiset_choice" name="emojiset_group" value="{{this.key}}" />
                     <span>{{this.text}}</span>
@@ -101,7 +101,7 @@
 
         {{> settings_checkbox
           setting_name="translate_emoticons"
-          is_checked=user_settings.translate_emoticons
+          is_checked=settings_object.translate_emoticons
           label=settings_label.translate_emoticons
           prefix=prefix}}
     </div>
diff --git a/static/templates/settings/notification_settings.hbs b/static/templates/settings/notification_settings.hbs
index de7c5cade9..43f8506a79 100644
--- a/static/templates/settings/notification_settings.hbs
+++ b/static/templates/settings/notification_settings.hbs
@@ -56,7 +56,7 @@
         {{#each notification_settings.desktop_notification_settings}}
         {{> settings_checkbox
           setting_name=this
-          is_checked=(lookup ../user_settings this)
+          is_checked=(lookup ../settings_object this)
           label=(lookup ../settings_label this)
           prefix=../prefix}}
         {{/each}}
@@ -71,7 +71,7 @@
               disabled
               {{/unless}}>
                 <option value="none">{{t "None" }}</option>
-                {{#each user_settings.available_notification_sounds}}
+                {{#each settings_object.available_notification_sounds}}
                 <option value="{{ this }}">{{ this }}</option>
                 {{/each}}
             </select>
@@ -97,7 +97,7 @@
         {{#each notification_settings.mobile_notification_settings}}
         {{> settings_checkbox
           setting_name=this
-          is_checked=(lookup ../user_settings this)
+          is_checked=(lookup ../settings_object this)
           label=(lookup ../settings_label this)
           show_push_notifications_tooltip=(lookup ../show_push_notifications_tooltip this)
           prefix=../prefix}}
@@ -124,7 +124,7 @@
         {{#each notification_settings.email_message_notification_settings}}
         {{> settings_checkbox
           setting_name=this
-          is_checked=(lookup ../user_settings this)
+          is_checked=(lookup ../settings_object this)
           label=(lookup ../settings_label this)
           prefix=../prefix}}
         {{/each}}
diff --git a/static/templates/settings/profile_settings.hbs b/static/templates/settings/profile_settings.hbs
index 199d5e49dc..d6067daf2c 100644
--- a/static/templates/settings/profile_settings.hbs
+++ b/static/templates/settings/profile_settings.hbs
@@ -33,7 +33,7 @@
                         <div class="alert-notification timezone-setting-status"></div>
                         <div class="timezone-input">
                             <select name="timezone" id="user_timezone" class>
-                                {{#unless user_settings.timezone}}
+                                {{#unless settings_object.timezone}}
                                 <option></option>
                                 {{/unless}}