diff --git a/modules/overlay/overlay.module b/modules/overlay/overlay.module
index 6d62c54..588cc4d 100644
--- a/modules/overlay/overlay.module
+++ b/modules/overlay/overlay.module
@@ -89,7 +89,7 @@ function overlay_form_user_profile_form_alter(&$form, &$form_state) {
       $form['overlay_control'] = array(
         '#type' => 'fieldset',
         '#title' => t('Administrative overlay'),
-        '#weight' => 4,
+        '#weight' => 50,
         '#collapsible' => TRUE,
       );
 
diff --git a/modules/user/user.module b/modules/user/user.module
index 821602d..cfa141b 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -196,7 +196,7 @@ function user_field_extra_fields() {
     'form' => array(
       'account' => array(
         'label' => 'User name and password',
-        'description' => t('User module account form elements'),
+        'description' => t('User module account form elements.'),
         'weight' => -10,
       ),
       'timezone' => array(
@@ -214,6 +214,26 @@ function user_field_extra_fields() {
     ),
   );
 
+  if (variable_get('user_pictures', 1) == 1) { 
+    $return['user']['user']['form'] += array(
+      'picture' => array(
+        'label' => 'User picture',
+        'description' => t('User module picture form element.'),
+        'weight' => 1,
+      ),   
+    );   
+  }
+ 
+  if (variable_get('user_signatures', 1) == 1) { 
+    $return['user']['user']['form'] += array(
+      'signature' => array(
+        'label' => 'User signature',
+        'description' => t('User module signature form element.'),
+        'weight' => 2,
+      ),   
+    );   
+  }
+
   return $return;
 }