diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockUserAccountSettingsTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockUserAccountSettingsTest.php
deleted file mode 100644
index ef482ee..0000000
--- a/core/modules/block/lib/Drupal/block/Tests/BlockUserAccountSettingsTest.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\block\Tests\BlockUserAccountSettingsTest.
- */
-
-namespace Drupal\block\Tests;
-
-use Drupal\simpletest\WebTestBase;
-
-/**
- * Tests personalized block settings for user accounts.
- */
-class BlockUserAccountSettingsTest extends WebTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('block', 'field_ui');
-
-  public static function getInfo() {
-    return array(
-      'name' => 'Personalized block settings',
-      'description' => 'Tests the block settings in user accounts.',
-      'group' => 'Block',
-    );
-  }
-
-  public function setUp() {
-    parent::setUp();
-    $admin_user = $this->drupalCreateUser(array('administer users'));
-    $this->drupalLogin($admin_user);
-  }
-
-  /**
-   * Tests that the personalized block is shown.
-   */
-  function testAccountSettingsPage() {
-    $this->drupalGet('admin/config/people/accounts/fields');
-    $this->assertText(t('Personalize blocks'), 'Personalized block is present.');
-  }
-}
diff --git a/core/modules/contact/contact.module b/core/modules/contact/contact.module
index 053df01..4954b4f 100644
--- a/core/modules/contact/contact.module
+++ b/core/modules/contact/contact.module
@@ -211,6 +211,18 @@ function contact_config_import_delete($name, $new_config, $old_config) {
 }
 
 /**
+ * Implements hook_field_extra_fields().
+ */
+function contact_field_extra_fields() {
+  $fields['user']['user']['form']['contact'] = array(
+    'label' => t('Contact settings'),
+    'description' => t('Contact module form element.'),
+    'weight' => 5,
+  );
+  return $fields;
+}
+
+/**
  * Loads a contact category.
  *
  * @param $id
diff --git a/core/modules/overlay/overlay.module b/core/modules/overlay/overlay.module
index 9863915..0a87426 100644
--- a/core/modules/overlay/overlay.module
+++ b/core/modules/overlay/overlay.module
@@ -82,6 +82,18 @@ function overlay_theme() {
 }
 
 /**
+ * Implements hook_field_extra_fields().
+ */
+function overlay_field_extra_fields() {
+  $fields['user']['user']['form']['overlay_control'] = array(
+    'label' => t('Administrative overlay'),
+    'description' => t('Overlay module form element.'),
+    'weight' => 4,
+  );
+  return $fields;
+}
+
+/**
  * Implements hook_form_FORM_ID_alter().
  */
 function overlay_form_user_profile_form_alter(&$form, &$form_state) {
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 285b9a7..2417563 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -217,6 +217,14 @@ function user_field_extra_fields() {
     ),
   );
 
+  if (config('user.settings')->get('signatures')) {
+    $return['user']['user']['form']['signature_settings'] = array(
+      'label' => t('Signature settings'),
+      'description' => t('User module form element.'),
+      'weight' => 1,
+    );
+  }
+
   return $return;
 }