diff --git a/app/assets/javascripts/admin/models/site_setting.js b/app/assets/javascripts/admin/models/site_setting.js
index c23aae99157..3f227970071 100644
--- a/app/assets/javascripts/admin/models/site_setting.js
+++ b/app/assets/javascripts/admin/models/site_setting.js
@@ -31,6 +31,15 @@ Discourse.SiteSetting = Discourse.Model.extend({
 
   }.property('value'),
 
+  /**
+    The name of the setting. Basically, underscores in the setting key are replaced with spaces.
+
+    @property settingName
+  **/
+  settingName: function() {
+    return this.get('setting').replace(/\_/g, ' ');
+  }.property('setting'),
+
   /**
     Has the user changed the setting? If so we should save it.
 
diff --git a/app/assets/javascripts/admin/templates/site_settings/setting_bool.js.handlebars b/app/assets/javascripts/admin/templates/site_settings/setting_bool.js.handlebars
index 277c45685d9..f84fec06dc1 100644
--- a/app/assets/javascripts/admin/templates/site_settings/setting_bool.js.handlebars
+++ b/app/assets/javascripts/admin/templates/site_settings/setting_bool.js.handlebars
@@ -1,5 +1,5 @@
 <div class='setting-label'>
-  <h3>{{unbound setting}}</h3>
+  <h3>{{unbound settingName}}</h3>
 </div>
 <div class="setting-value">
   <label>
diff --git a/app/assets/javascripts/admin/templates/site_settings/setting_enum.js.handlebars b/app/assets/javascripts/admin/templates/site_settings/setting_enum.js.handlebars
index 7eda1e610bb..3e7e2051fae 100644
--- a/app/assets/javascripts/admin/templates/site_settings/setting_enum.js.handlebars
+++ b/app/assets/javascripts/admin/templates/site_settings/setting_enum.js.handlebars
@@ -1,5 +1,5 @@
 <div class='setting-label'>
-   <h3>{{unbound setting}}</h3>
+   <h3>{{unbound settingName}}</h3>
 </div>
 <div class="setting-value">
   {{combobox valueAttribute="value" content=validValues value=value none=allowsNone}}
diff --git a/app/assets/javascripts/admin/templates/site_settings/setting_string.js.handlebars b/app/assets/javascripts/admin/templates/site_settings/setting_string.js.handlebars
index ae45a2c2666..e2450ef14bf 100644
--- a/app/assets/javascripts/admin/templates/site_settings/setting_string.js.handlebars
+++ b/app/assets/javascripts/admin/templates/site_settings/setting_string.js.handlebars
@@ -1,5 +1,5 @@
 <div class='setting-label'>
-   <h3>{{unbound setting}}</h3>
+   <h3>{{unbound settingName}}</h3>
 </div>
 <div class="setting-value">
   {{textField value=value classNames="input-setting-string"}}