--- aweber.module.orig	2011-05-22 18:50:32.000000000 +0000
+++ aweber.module	2011-05-22 19:05:17.000000000 +0000
@@ -46,14 +46,14 @@
   $items['admin/user/aweber/edit/%aweber_lead'] = array(
     'title' => 'Edit lead status',
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('aweber_lead_edit_form'),
+    'page arguments' => array('aweber_lead_edit_form', 4),
     'access arguments' => array('access administration pages'),
     'type' => MENU_CALLBACK
   );
   $items['admin/user/aweber/delete/%aweber_lead'] = array(
     'title' => 'Delete lead',
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('aweber_lead_delete_form'),
+    'page arguments' => array('aweber_lead_delete_form', 4),
     'access arguments' => array('access administration pages'),
     'type' => MENU_CALLBACK
   );
@@ -132,7 +132,7 @@
   return system_settings_form($form);
 }
 
-function aweber_lead_edit_form($aweber_lead) {
+function aweber_lead_edit_form(&$form_state, $aweber_lead) {
   $form['mail'] = array(
     '#type' => 'markup',
     '#value' => '<p>' . check_plain($aweber_lead->mail) . '</p>',
@@ -159,10 +159,10 @@
   $form_state['redirect'] = 'admin/user/aweber';
 }
 
-function aweber_lead_delete_form($aweber_lead) {
+function aweber_lead_delete_form(&$form_state, $aweber_lead) {
   $form['lead'] = array(
     '#type' => 'hidden',
-    '#value' => $aweber_lead
+    '#value' => $aweber_lead->uid
   );
 
   return confirm_form(
@@ -176,15 +176,15 @@
 }
 
 function aweber_lead_delete_form_submit($form, &$form_state) {
-  $lead = $form_state['values']['lead'];
-  $account = user_load(array('uid' => $lead->uid));
+  $uid = $form_state['values']['lead'];
+  $account = user_load(array('uid' => $uid));
   if ($account->uid) {
     $account->aweber_signup = 0;
     user_save($account, array('aweber_signup' => 0));
-  }
 
-  db_query("DELETE FROM {aweber} WHERE aid = %d", $aid);
-  drupal_set_message(t('Lead was deleted.'));
+    db_query("DELETE FROM {aweber} WHERE uid = %d", $account->uid);
+    drupal_set_message(t('Lead was deleted.'));
+  }
   $form_state['redirect'] = 'admin/user/aweber';
 }
 
@@ -371,7 +371,7 @@
     array('data' => t('User')),
     array('data' => t('Status'), 'field' => 'status'),
     array('data' => t('Added'), 'field' => 'timestamp'),
-    array('data' => t('Operations'), 'colspan' => '1')
+    array('data' => t('Operations'), 'colspan' => '2')
   );
 
   $sql = 'SELECT * FROM {aweber}';