diff --git a/template.php b/template.php
index ef2fa43..0125ed4 100644
--- a/template.php
+++ b/template.php
@@ -201,11 +201,13 @@ function tao_preprocess_comment(&$vars) {
  */
 function tao_preprocess_fieldset(&$vars) {
   $element = $vars['element'];
+  _form_set_class($element, array('form-wrapper'));
   $vars['attributes'] = $element['#attributes'];
   $vars['attributes']['class'][] = 'fieldset';
   if (!empty($element['#title'])) {
     $vars['attributes']['class'][] = 'titled';
   }
+  $vars['attributes']['id'] = $element['#id'];
 
   $description = !empty($element['#description']) ? "<div class='description'>{$element['#description']}</div>" : '';
   $children = !empty($element['#children']) ? $element['#children'] : '';