diff --git a/modules/block/block.module b/modules/block/block.module
index ff77d9e..be7c9a5 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -592,6 +592,19 @@ function block_form_user_profile_form_alter(&$form, &$form_state) {
 }
 
 /**
+ * Implements hook_field_extra_fields().
+ */
+function block_field_extra_fields() {
+  $extra['user']['user']['form']['block'] = array(
+    'label' => t('Personalize blocks'),
+    'description' => t('Block module form element.'),
+    'weight' => 3,
+  );
+
+  return $extra;
+}
+
+/**
  * Implements hook_user_presave().
  */
 function block_user_presave(&$edit, $account, $category) {
diff --git a/modules/contact/contact.module b/modules/contact/contact.module
index 9a48f23..a7d8ce7 100644
--- a/modules/contact/contact.module
+++ b/modules/contact/contact.module
@@ -257,3 +257,16 @@ function contact_form_user_admin_settings_alter(&$form, &$form_state) {
     '#default_value' => variable_get('contact_default_status', 1),
   );
 }
+
+/**
+ * Implements hook_field_extra_fields().
+ */
+function contact_field_extra_fields() {
+  $extra['user']['user']['form']['contact'] = array(
+    'label' => t('Contact'),
+    'description' => t('Contact module form element.'),
+    'weight' => 5,
+  );
+
+  return $extra;
+}
diff --git a/modules/locale/locale.module b/modules/locale/locale.module
index b60c531..913f918 100644
--- a/modules/locale/locale.module
+++ b/modules/locale/locale.module
@@ -320,6 +320,19 @@ function locale_form_path_admin_form_alter(&$form, &$form_state) {
 }
 
 /**
+ * Implements hook_field_extra_fields().
+ */
+function locale_field_extra_fields() {
+  $extra['user']['user']['form']['locale'] = array(
+    'label' => t('Language settings'),
+    'description' => t('Locale module form element.'),
+    'weight' => 0,
+  );
+
+  return $extra;
+}
+
+/**
  * Implements hook_form_FORM_ID_alter().
  */
 function locale_form_node_type_form_alter(&$form, &$form_state) {
diff --git a/modules/overlay/overlay.module b/modules/overlay/overlay.module
index 7281986..1917648 100644
--- a/modules/overlay/overlay.module
+++ b/modules/overlay/overlay.module
@@ -103,6 +103,19 @@ function overlay_form_user_profile_form_alter(&$form, &$form_state) {
 }
 
 /**
+ * Implements hook_field_extra_fields().
+ */
+function overlay_field_extra_fields() {
+  $extra['user']['user']['form']['overlay_control'] = array(
+    'label' => t('Administrative overlay'),
+    'description' => t('Overlay module form element.'),
+    'weight' => 4,
+  );
+
+  return $extra;
+}
+
+/**
  * Implements hook_user_presave().
  */
 function overlay_user_presave(&$edit, $account, $category) {
diff --git a/modules/user/user.module b/modules/user/user.module
index 1311a28..21c6aa5 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -212,7 +212,7 @@ function user_field_info_alter(&$info) {
  * Implements hook_field_extra_fields().
  */
 function user_field_extra_fields() {
-  $return['user']['user'] = array(
+  $extra['user']['user'] = array(
     'form' => array(
       'account' => array(
         'label' => t('User name and password'),
@@ -234,7 +234,27 @@ function user_field_extra_fields() {
     ),
   );
 
-  return $return;
+  if (variable_get('user_pictures', 0)) {
+    $extra['user']['user']['form'] += array(
+      'picture' => array(
+        'label' => t('User picture'),
+        'description' => t('User module picture form element.'),
+        'weight' => 2,
+      ),
+    );
+  }
+
+  if (variable_get('user_signatures', 0)) {
+    $extra['user']['user']['form'] += array(
+      'signature_settings' => array(
+        'label' => t('Signature settings'),
+        'description' => t('User module form element.'),
+        'weight' => 1,
+      ),
+    );
+  }
+
+  return $extra;
 }
 
 /**