diff --git a/Swat/SwatFormField.php b/Swat/SwatFormField.php
index <HASH>..<HASH> 100644
--- a/Swat/SwatFormField.php
+++ b/Swat/SwatFormField.php
@@ -83,11 +83,10 @@ class SwatFormField extends SwatContainer
 		$messages = &$this->getMessages();
 		$container_div = new SwatHtmlTag('div');
 
+		$container_div->class = $this->class;
 		if (count($messages) > 0)
 			// TODO: more classes based on message type?
-			$container_div->class = $this->error_class;
-		else
-			$container_div->class = $this->class;
+			$container_div->class .= ' '.$this->error_class;
 
 		$container_div->open();
Make SwatFormFields will errors have both the swat-form-field CSS class AND the swat-form-field-error class, rather than just the error class (this is our convention)


svn commit r<I>