diff --git a/user_delete.module b/user_delete.module
index 99ee375..035b36d 100644
--- a/user_delete.module
+++ b/user_delete.module
@@ -79,7 +79,7 @@ function user_delete_form_alter(&$form, $form_state, $form_id) {
   if ($form_id == 'user_confirm_delete') {
     $description = '';
     $default_op = variable_get('user_delete_default_action', 0);
-    if ($default_op) {
+    if (!user_access('administer users') && $default_op) {
       switch ($default_op) {
         case 'user_delete_block':
           $description = t('The account will be disabled, all submitted content will be kept.');
@@ -100,14 +100,7 @@ function user_delete_form_alter(&$form, $form_state, $form_id) {
         '#weight' => -10,
       );
     }
-
-    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(variable_get('user_delete_backup_period', 60*60*24*7*12), 2))),
-        '#weight' => -10,
-      );
-    }
-    if (!variable_get('user_delete_default_action', 0)) {
+    else {
       $form['user_delete_action'] = array(
         '#type' => 'radios',
         '#title' => t('When deleting the account'),
@@ -120,6 +113,14 @@ function user_delete_form_alter(&$form, $form_state, $form_id) {
         ),
         '#weight' => 0,
       );
+      unset($form['description']);
+    }
+
+    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(variable_get('user_delete_backup_period', 60*60*24*7*12), 2))),
+        '#weight' => -10,
+      );
     }
     $form['#redirect'] = 'user/' . $form['_account']['#value']->uid;
     $form['#submit'] = array('user_delete_submit');
@@ -131,8 +132,7 @@ function user_delete_form_alter(&$form, $form_state, $form_id) {
  */
 function user_delete_submit($form, &$form_state) {
   global $user;
-  $default_op = variable_get('user_delete_default_action', 0);
-  $op = ($default_op) ? $default_op : $form_state['values']['user_delete_action'];
+  $op = isset($form_state['values']['user_delete_action']) ? $form_state['values']['user_delete_action'] : variable_get('user_delete_default_action', 0);
   $uid = $form_state['values']['_account']->uid;
   $account = user_load(array('uid' => $uid));
   $backup = variable_get('user_delete_backup', 0);