Index: contact.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact/contact.admin.inc,v
retrieving revision 1.14
diff -u -p -r1.14 contact.admin.inc
--- contact.admin.inc	19 Aug 2009 12:56:47 -0000	1.14
+++ contact.admin.inc	22 Aug 2009 15:28:09 -0000
@@ -170,10 +170,5 @@ function contact_admin_settings() {
     '#default_value' => 3,
     '#description' => t('The maximum number of contact form submissions a user can perform per hour.'),
   );
-  $form['contact_default_status'] = array(
-    '#type' => 'checkbox',
-    '#title' => t('Enable the personal contact form by default for new users'),
-    '#default_value' => 1,
-  );
   return system_settings_form($form, TRUE);
 }
Index: contact.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact/contact.module,v
retrieving revision 1.120
diff -u -p -r1.120 contact.module
--- contact.module	12 Aug 2009 12:36:04 -0000	1.120
+++ contact.module	22 Aug 2009 15:28:09 -0000
@@ -85,13 +85,6 @@ function contact_menu() {
     'access arguments' => array('administer site-wide contact form'),
     'type' => MENU_CALLBACK,
   );
-  $items['admin/settings/contact'] = array(
-    'title' => 'Contact form',
-    'description' => 'Toggle personal contact forms and maximum contact form submissions.',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('contact_admin_settings'),
-    'access arguments' => array('administer site-wide contact form'),
-  );
   $items['contact'] = array(
     'title' => 'Contact',
     'page callback' => 'contact_site_page',
@@ -192,3 +185,18 @@ function contact_mail($key, &$message, $
       break;
   }
 }
+
+
+/**
+  * Implement hook_form_alter().
+  */
+function contact_form_alter(&$form, &$form_state, $form_id) {
+  if ($form_id == 'user_admin_settings') {
+    $form['personalization']['contact_default_status'] = array(
+        '#type' => 'checkbox',
+        '#title' => t('Enable the personal contact form by default for new users'),
+        '#default_value' => variable_get('contact_default_status'),
+        '#weight' => 0,
+        );
+  }
+}
Index: contact.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact/contact.test,v
retrieving revision 1.29
diff -u -p -r1.29 contact.test
--- contact.test	21 Aug 2009 14:27:44 -0000	1.29
+++ contact.test	22 Aug 2009 15:28:09 -0000
@@ -29,7 +29,7 @@ class ContactSitewideTestCase extends Dr
     $edit = array();
     $edit['contact_hourly_threshold'] = 3;
     $edit['contact_default_status'] = TRUE;
-    $this->drupalPost('admin/settings/contact', $edit, t('Save configuration'));
+    $this->drupalPost('admin/config/people/accounts', $edit, t('Save configuration'));
     $this->assertText(t('The configuration options have been saved.'), t('Setting successfully saved.'));
 
     // Delete old categories to ensure that new categories are used.
@@ -322,7 +322,7 @@ class ContactPersonalTestCase extends Dr
     $edit = array();
     $edit['contact_default_status'] = TRUE;
     $edit['contact_hourly_threshold'] = $flood_control;
-    $this->drupalPost('admin/settings/contact', $edit, t('Save configuration'));
+    $this->drupalPost('admin/config/people/accounts', $edit, t('Save configuration'));
     $this->assertText(t('The configuration options have been saved.'), t('Setting successfully saved.'));
 
     // Reload variables.
@@ -366,7 +366,7 @@ class ContactPersonalTestCase extends Dr
     // Disable the personal contact form.
     $edit = array();
     $edit['contact_default_status'] = FALSE;
-    $this->drupalPost('admin/settings/contact', $edit, t('Save configuration'));
+    $this->drupalPost('admin/config/people/accounts', $edit, t('Save configuration'));
     $this->assertText(t('The configuration options have been saved.'), t('Setting successfully saved.'));
 
     // Reload variables.