diff --git a/modules/user/user-profile-category.tpl.php b/modules/user/user-profile-category.tpl.php
index 0de7d5d..3e29582 100644
--- a/modules/user/user-profile-category.tpl.php
+++ b/modules/user/user-profile-category.tpl.php
@@ -24,10 +24,12 @@
  * @see template_preprocess_user_profile_category()
  */
 ?>
-<?php if ($title) : ?>
-  <h3><?php print $title; ?></h3>
-<?php endif; ?>
+<section class="<?php print $classes; ?>">
+  <?php if ($title) : ?>
+    <h2><?php print $title; ?></h2>
+  <?php endif; ?>
 
-<dl<?php print $attributes; ?>>
-  <?php print $profile_items; ?>
-</dl>
+  <dl<?php print $attributes; ?>>
+    <?php print $profile_items; ?>
+  </dl>
+</section>
diff --git a/modules/user/user.css b/modules/user/user.css
index 079ec38..a303307 100644
--- a/modules/user/user.css
+++ b/modules/user/user.css
@@ -87,7 +87,7 @@ div.password-suggestions ul {
   float: right; /* LTR */
   margin: 0 1em 1em 0; /* LTR */
 }
-.profile h3 {
+.profile h2 {
   border-bottom: 1px solid #ccc;
 }
 .profile dl {
diff --git a/modules/user/user.pages.inc b/modules/user/user.pages.inc
index 697a82d..09bf33b 100644
--- a/modules/user/user.pages.inc
+++ b/modules/user/user.pages.inc
@@ -222,6 +222,7 @@ function template_preprocess_user_profile_item(&$variables) {
  */
 function template_preprocess_user_profile_category(&$variables) {
   $variables['title'] = check_plain($variables['element']['#title']);
+  $variables['classes_array'][] = 'user-profile-category-' . drupal_html_class($variables['title']);
   $variables['profile_items'] = $variables['element']['#children'];
   $variables['attributes'] = '';
   if (isset($variables['element']['#attributes'])) {