Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.1179
diff -u -p -r1.1179 user.module
--- modules/user/user.module	29 Jun 2010 18:24:10 -0000	1.1179
+++ modules/user/user.module	6 Jul 2010 18:10:23 -0000
@@ -1039,7 +1039,13 @@ function user_account_form(&$form, &$for
   else {
     $status = $register ? variable_get('user_register', USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL) == USER_REGISTER_VISITORS : $account->status;
   }
-  $form['account']['status'] = array(
+
+  $form['account']['set_status'] = array(
+    '#type' => 'fieldset',
+    '#attributes' => array('style' => 'border-width:0; margin:0; padding:0; top:0; -moz-border-radius:0;'),
+ );
+
+  $form['account']['set_status']['status'] = array(
     '#type' => 'radios',
     '#title' => t('Status'),
     '#default_value' => $status,
@@ -1060,7 +1066,11 @@ function user_account_form(&$form, &$for
     '#disabled' => TRUE,
   );
   unset($roles[DRUPAL_AUTHENTICATED_RID]);
-  $form['account']['roles'] = array(
+  $form['account']['set_roles'] = array(
+    '#type' => 'fieldset',
+    '#attributes' => array('style' => 'border-width:0; margin:0; padding:0; top:0; -moz-border-radius:0;'),
+  ); 
+  $form['account']['set_roles']['roles'] = array(
     '#type' => 'checkboxes',
     '#title' => t('Roles'),
     '#default_value' => (!$register && isset($account->roles) ? array_keys($account->roles) : array()),