diff --git a/app/helpers/admin/configuration_helper.rb b/app/helpers/admin/configuration_helper.rb
index <HASH>..<HASH> 100644
--- a/app/helpers/admin/configuration_helper.rb
+++ b/app/helpers/admin/configuration_helper.rb
@@ -61,9 +61,9 @@ module Admin::ConfigurationHelper
     end
     if setting.errors[:value].present?
       html << content_tag(:span, [setting.errors[:value]].flatten.first, :class => 'error')
-      html = content_tag(:span, html, :class => "error-with-field")
+      html = content_tag(:span, html.html_safe, :class => "error-with-field")
     end
-    html
+    html.html_safe
   end
 
   def setting_for(key)
diff --git a/spec/features/config_spec.rb b/spec/features/config_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/features/config_spec.rb
+++ b/spec/features/config_spec.rb
@@ -27,4 +27,14 @@ describe 'Configuration (Settings)' do
     click_button 'Edit Preferences'
     click_link 'Change'
   end
+
+  it 'lets you edit the site preferences' do
+    click_button 'Edit Configuration'
+    fill_in 'Site Title', with: 'My Special Site'
+    click_button 'Save Changes'
+
+    within '#site_title' do
+      expect(page).to have_content  'My Special Site'
+    end
+  end
 end
Yay more html_safe! Now we can edit site preferences.