diff --git a/app/assets/javascripts/admin/templates/components/site-setting.hbs b/app/assets/javascripts/admin/templates/components/site-setting.hbs
index 768be98e1..eb117c0f4 100644
--- a/app/assets/javascripts/admin/templates/components/site-setting.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-setting.hbs
@@ -9,8 +9,6 @@
     {{d-button class="ok no-text" action="save" icon="check"}}
     {{d-button class="cancel no-text" action="cancel" icon="times"}}
   </div>
-{{else}}
-  {{#if setting.overridden}}
-    {{d-button action="resetDefault" icon="undo" label="admin.site_settings.reset"}}
-  {{/if}}
+{{else if setting.overridden}}
+  {{d-button action="resetDefault" icon="undo" label="admin.site_settings.reset"}}
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/site-settings/bool.hbs b/app/assets/javascripts/admin/templates/site-settings/bool.hbs
index bf51ed900..1f441c421 100644
--- a/app/assets/javascripts/admin/templates/site-settings/bool.hbs
+++ b/app/assets/javascripts/admin/templates/site-settings/bool.hbs
@@ -1,4 +1,4 @@
 <label>
   {{input type="checkbox" checked=enabled}}
-  {{unbound setting.description}}
+  {{{unbound setting.description}}}
 </label>
diff --git a/app/assets/javascripts/admin/templates/site-settings/enum.hbs b/app/assets/javascripts/admin/templates/site-settings/enum.hbs
index b6676e3c3..67cbfc92a 100644
--- a/app/assets/javascripts/admin/templates/site-settings/enum.hbs
+++ b/app/assets/javascripts/admin/templates/site-settings/enum.hbs
@@ -1,4 +1,4 @@
 {{combo-box valueAttribute="value" content=setting.validValues value=buffered.value none=setting.allowsNone}}
 {{preview}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{unbound setting.description}}</div>
+<div class='desc'>{{{unbound setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/site-settings/list.hbs b/app/assets/javascripts/admin/templates/site-settings/list.hbs
index 588d8d338..bc1cf2b51 100644
--- a/app/assets/javascripts/admin/templates/site-settings/list.hbs
+++ b/app/assets/javascripts/admin/templates/site-settings/list.hbs
@@ -1,3 +1,3 @@
 {{list-setting settingValue=buffered.value choices=setting.choices settingName=setting.setting}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{unbound setting.description}}</div>
+<div class='desc'>{{{unbound setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/site-settings/string.hbs b/app/assets/javascripts/admin/templates/site-settings/string.hbs
index 9770efb75..f8427094a 100644
--- a/app/assets/javascripts/admin/templates/site-settings/string.hbs
+++ b/app/assets/javascripts/admin/templates/site-settings/string.hbs
@@ -1,3 +1,3 @@
 {{text-field value=buffered.value classNames="input-setting-string"}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{unbound setting.description}}</div>
+<div class='desc'>{{{unbound setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/site-settings/url_list.hbs b/app/assets/javascripts/admin/templates/site-settings/url_list.hbs
index e3751f317..bd22e1b03 100644
--- a/app/assets/javascripts/admin/templates/site-settings/url_list.hbs
+++ b/app/assets/javascripts/admin/templates/site-settings/url_list.hbs
@@ -1,3 +1,3 @@
 {{url-list value=buffered.value}}
 {{setting-validation-message message=validationMessage}}
-<div class='desc'>{{unbound setting.description}}</div>
+<div class='desc'>{{{unbound setting.description}}}</div>