Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.327
diff -u -r1.327 form.inc
--- includes/form.inc	11 Apr 2009 22:19:44 -0000	1.327
+++ includes/form.inc	26 Apr 2009 09:36:43 -0000
@@ -2628,7 +2628,14 @@
   // This is also used in the installer, pre-database setup.
   $t = get_t();
 
-  $output = '<div class="form-item"';
+  $class = array('form-item');
+  // add element type to class.
+  $class[] = 'form-'. strtr($element['#type'], '_', '-');
+  // add classes of element to surrounding div.
+  if (isset($element['#attributes']['class'])) {
+  	$class[] = $element['#attributes']['class'];
+  }
+  $output = '<div class="'. implode(' ', $class) .'"';
   if (!empty($element['#id'])) {
     $output .= ' id="' . $element['#id'] . '-wrapper"';
   }
Index: modules/system/system.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.css,v
retrieving revision 1.54
diff -u -r1.54 system.css
--- modules/system/system.css	11 Apr 2009 22:19:45 -0000	1.54
+++ modules/system/system.css	26 Apr 2009 09:36:44 -0000
@@ -561,6 +561,6 @@
 .confirm-parent {
   margin: 0;
 }
-div.password-confirm {
+.confirm-parent div.password-confirm {
   visibility: hidden;
 }
Index: modules/user/user.js
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.js,v
retrieving revision 1.11
diff -u -r1.11 user.js
--- modules/user/user.js	13 Mar 2009 23:15:09 -0000	1.11
+++ modules/user/user.js	26 Apr 2009 09:36:46 -0000
@@ -27,7 +27,7 @@
       // Add the password confirmation layer.
       $("input.password-confirm", outerWrapper).after('<div class="password-confirm">' + translate["confirmTitle"] + ' <span></span></div>').parent().addClass("confirm-parent");
       var confirmInput = $("input.password-confirm", outerWrapper);
-      var confirmResult = $("div.password-confirm", outerWrapper);
+      var confirmResult = $(".confirm-parent div.password-confirm", outerWrapper);
       var confirmChild = $("span", confirmResult);
 
       // Check the password strength.