diff --git a/AUTHORS b/AUTHORS
index 13c4ce741..9f1d23e79 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -27,6 +27,7 @@ Jeffrey Wilcox <jeffjapan@gmail.com>
 Jesse Andrews <anotherjesse@gmail.com>
 Joe Heck <heckj@mac.com>
 Joseph Heck <heckj@mac.com>
+Joshua McKenty <joshua@pistoncloud.com>
 Julien Danjou <julien.danjou@enovance.com>
 Ken Pepple <ken.pepple@gmail.com>
 lzyeval <lzyeval@gmail.com>
diff --git a/horizon/templates/horizon/common/_form_fields.html b/horizon/templates/horizon/common/_form_fields.html
index da5a7d7e0..6e8946b5e 100644
--- a/horizon/templates/horizon/common/_form_fields.html
+++ b/horizon/templates/horizon/common/_form_fields.html
@@ -7,7 +7,7 @@
   </div>
 {% endif %}
 {% for field in form.visible_fields %}
-  <div class="form-field clearfix{% if field.errors %} error{% endif %}">
+  <div class="control-group form-field clearfix{% if field.errors %} error{% endif %}">
     {{ field.label_tag }}
     {% if field.errors %}
       {% for error in field.errors %}
diff --git a/openstack_dashboard/static/dashboard/css/style.css b/openstack_dashboard/static/dashboard/css/style.css
index 7dca99040..99abfe8f4 100644
--- a/openstack_dashboard/static/dashboard/css/style.css
+++ b/openstack_dashboard/static/dashboard/css/style.css
@@ -914,3 +914,11 @@ iframe {
   float: left;
   margin-right: 50px;
 }
+
+.error .help-inline {
+	background: #efdfdf;
+	border: 1px solid #ead5d8;
+	padding: 10px;
+	display: block;
+	width: 304px;
+}
\ No newline at end of file