diff --git a/app/assets/stylesheets/components/buttons.css b/app/assets/stylesheets/components/buttons.css
index 5da9116..c50d071 100644
--- a/app/assets/stylesheets/components/buttons.css
+++ b/app/assets/stylesheets/components/buttons.css
@@ -32,8 +32,4 @@
     @apply bg-red-600 hover:bg-red-700 text-white
            focus:ring-red-500 focus:ring-opacity-75;
   }
-
-  input[type=text]:disabled {
-    @apply text-gray-700;
-  }
 }
diff --git a/app/assets/stylesheets/components/forms.css b/app/assets/stylesheets/components/forms.css
index 633c293..46f1df9 100644
--- a/app/assets/stylesheets/components/forms.css
+++ b/app/assets/stylesheets/components/forms.css
@@ -6,12 +6,13 @@
            focus:ring-blue-600 focus:ring-opacity-75;
   }
 
-  .field_with_errors {
-    @apply inline-block;
+  input[type=text]:disabled,
+  input[type=email]:disabled {
+    @apply text-gray-700;
   }
 
-  .field_with_errors input {
-    @apply w-full bg-red-100;
+  input.field_with_errors {
+    @apply border-b-red-600;
   }
 
   .error-msg {
diff --git a/config/initializers/field_with_errors.rb b/config/initializers/field_with_errors.rb
new file mode 100644
index 0000000..3652aa9
--- /dev/null
+++ b/config/initializers/field_with_errors.rb
@@ -0,0 +1,9 @@
+ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
+  if html_tag.match('class')
+    html_tag.gsub(/class="(.*?)"/, 'class="\1 field_with_errors"').html_safe
+  else
+    parts = html_tag.split('>', 2)
+    parts[0] += ' class="field_with_errors">'
+    (parts[0] + parts[1]).html_safe
+  end
+end