diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6dbaa1231..279058929 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 ### Bug Fix
 - Mobile devices no longer need to click twice to vote
+- Rails model errors are now again correctly styled using Bootstrap CSS classes
 
 ## 14.0.0 (August 9, 2016)
 
diff --git a/config/application.rb b/config/application.rb
index 34e8d2c70..915fedbed 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -28,6 +28,11 @@ class Application < Rails::Application
     # Run "rails time:zones" for a list of tasks for finding time zone names. Default is UTC.
     config.time_zone = 'Eastern Time (US & Canada)'
 
+    # Overwrite Rails errors to use Bootstrap CSS classes
+    config.action_view.field_error_proc = Proc.new do |html_tag, instance|
+      "<span class=\"has-error\">#{html_tag}</span>".html_safe
+    end
+
     # Add Model subfolders to autoload_paths
     # config.autoload_paths += Dir[Rails.root.join('app', 'models', '{**/}')]
     config.autoload_paths << Rails.root.join('app', 'models', 'admin')