diff --git a/design/admin2/templates/content/edit_attribute.tpl b/design/admin2/templates/content/edit_attribute.tpl
index df9adb4ffe6992d9ceaedad3b671bf981f30e3a2..07431049dcde2c09367f614502db2c2fabe14052 100644
--- a/design/admin2/templates/content/edit_attribute.tpl
+++ b/design/admin2/templates/content/edit_attribute.tpl
@@ -5,8 +5,8 @@
 {foreach $content_attributes_grouped_data_map as $attribute_group => $content_attributes_grouped}
 {if $attribute_group|ne( $attribute_default_category )}
     <fieldset class="ezcca-collapsible ezcca-attributes-group-{$attribute_group|wash}">
-	<legend><a href="JavaScript:void(0);">{$attribute_categorys[$attribute_group]}</a></legend>
-	<div class="ezcca-collapsible-fieldset-content">
+    <legend><a href="JavaScript:void(0);">{$attribute_categorys[$attribute_group]}</a></legend>
+    <div class="ezcca-collapsible-fieldset-content">
 {/if}
 {foreach $content_attributes_grouped as $attribute_identifier => $attribute}
 {def $contentclass_attribute = $attribute.contentclass_attribute}
@@ -87,21 +87,25 @@ jQuery(function( $ )
 {
     $('fieldset.ezcca-collapsible legend a').click( function()
     {
-		var container = $( this.parentNode.parentNode ), inner = container.find('div.ezcca-collapsible-fieldset-content');
-		if ( container.hasClass('ezcca-collapsed') )
-		{
-			container.removeClass('ezcca-collapsed');
-			inner.slideDown( 150 );
-	    }
-		else
-		{
-			inner.slideUp( 150, function(){
-            	$( this.parentNode ).addClass('ezcca-collapsed');
+        var container = $( this.parentNode.parentNode ), inner = container.find('div.ezcca-collapsible-fieldset-content');
+        if ( container.hasClass('ezcca-collapsed') )
+        {
+            container.removeClass('ezcca-collapsed');
+            inner.slideDown( 150 );
+        }
+        else
+        {
+            inner.slideUp( 150, function(){
+                $( this.parentNode ).addClass('ezcca-collapsed');
             });
         }
     });
-    // Collapse by default
-    $('fieldset.ezcca-collapsible').addClass('ezcca-collapsed').find('div.ezcca-collapsible-fieldset-content').hide();
+    // Collapse by default, unless the group has at least one attribute with label.message-error
+    var fieldset = $('fieldset.ezcca-collapsible');
+    if ( fieldset.find('label.message-error').length == 0 )
+    {
+        fieldset.addClass('ezcca-collapsed').find('div.ezcca-collapsible-fieldset-content').hide();
+    }
 });
 
 {/literal}