Index: user_delete.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/user_delete/Attic/user_delete.admin.inc,v
retrieving revision 1.1.2.3
diff -u -p -r1.1.2.3 user_delete.admin.inc
--- user_delete.admin.inc	10 Aug 2009 19:03:21 -0000	1.1.2.3
+++ user_delete.admin.inc	16 Sep 2009 14:47:35 -0000
@@ -17,6 +17,22 @@
  */
 function user_delete_settings() {
   //TODO: add additional settings based on http://drupal.org/node/8#comment-628434
+  $form['defaults'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Defaults'),
+  );
+  $form['defaults']['user_delete_default_action'] = array(
+    '#type' => 'select',
+    '#title' => t('Default action when deleting'),
+    '#default_value' => variable_get('user_delete_default_action', 0),
+    '#options' => array(
+        0 => t('Let users choose action'),
+        'user_delete_block' => t('Disable the account and keep all content.'),
+        'user_delete_block_unpublish' => t('Disable the account and unpublish all content.'),
+        'user_delete_reassign' => t('Delete the account and make all content belong to the <em>Anonymous user</em>.'),
+        'user_delete_delete' => t('Delete the account and all content.'),
+      ),
+  );
   $form['redirect'] = array(
     '#type' => 'fieldset',
     '#title' => t('Redirect'),
Index: user_delete.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/user_delete/user_delete.module,v
retrieving revision 1.8.2.6
diff -u -p -r1.8.2.6 user_delete.module
--- user_delete.module	10 Aug 2009 19:03:21 -0000	1.8.2.6
+++ user_delete.module	16 Sep 2009 14:49:27 -0000
@@ -79,26 +79,26 @@ function user_delete_form_alter(&$form, 
   }
 
   if ($form_id == 'user_confirm_delete') {
-    $backup = variable_get('user_delete_backup', 0);
-    if ($backup) {
-      $period = variable_get('user_delete_backup_period', 60*60*24*7*12);
+    if (variable_get('user_delete_backup', 0)) {
       $form['user_delete_remark'] = array(
-        '#value' => t('All data that is being deleted will be backed up for %period and automatically deleted afterwards.', array('%period' => format_interval($period, 2))),
+        '#value' => t('All data that is being deleted will be backed up for %period and automatically deleted afterwards.', array('%period' => format_interval(variable_get('user_delete_backup_period', 60*60*24*7*12), 2))),
         '#weight' => -10,
       );
     }
-    $form['user_delete_action'] = array(
-      '#type' => 'radios',
-      '#title' => t('When deleting the account'),
-      '#default_value' => 'user_delete_block',
-      '#options' => array(
-        'user_delete_block' => t('Disable the account and keep all content.'),
-        'user_delete_block_unpublish' => t('Disable the account and unpublish all content.'),
-        'user_delete_reassign' => t('Delete the account and make all content belong to the <em>Anonymous user</em>.'),
-        'user_delete_delete' => t('Delete the account and all content.'),
-      ),
-      '#weight' => 0,
-    );
+    if (!variable_get('user_delete_default_action', 0)) {
+      $form['user_delete_action'] = array(
+        '#type' => 'radios',
+        '#title' => t('When deleting the account'),
+        '#default_value' => 'user_delete_block',
+        '#options' => array(
+          'user_delete_block' => t('Disable the account and keep all content.'),
+          'user_delete_block_unpublish' => t('Disable the account and unpublish all content.'),
+          'user_delete_reassign' => t('Delete the account and make all content belong to the <em>Anonymous user</em>.'),
+          'user_delete_delete' => t('Delete the account and all content.'),
+        ),
+        '#weight' => 0,
+      );
+    }
     $form['#redirect'] = 'user/' . $form['_account']['#value']->uid;
     $form['#submit'] = array('user_delete_submit');
   }
@@ -109,7 +109,8 @@ function user_delete_form_alter(&$form, 
  */
 function user_delete_submit($form, &$form_state) {
   global $user;
-  $op = $form_state['values']['user_delete_action'];
+  $default_op = variable_get('user_delete_default_action', 0);
+  $op = ($default_op) ? $default_op : $form_state['values']['user_delete_action'];
   $uid = $form_state['values']['_account']->uid;
   $account = user_load(array('uid' => $uid));
   $backup = variable_get('user_delete_backup', 0);