--- account_expiry.module	2008-05-01 22:04:17.000000000 -0600
+++ account_expiry.module.new	2008-05-02 12:03:39.000000000 -0600
@@ -346,9 +346,9 @@ function account_expiry_update($uid, $ex
 }
       
 function account_expiry_expire($uid) {
-  $sql = "UPDATE {users} SET status = 0 WHERE uid = %d";
-  $result = FALSE;
-  if (db_query($sql, $uid)) {
+  $user = user_load(array('uid' => $uid));
+  $account = user_save($user, array('status' => 0));
+  if ($user->status != $account->status) {
     drupal_set_message(t('Account blocked for user '. $uid));
     $result = TRUE;
   }
@@ -359,8 +359,9 @@ function account_expiry_expire($uid) {
 }
 
 function account_expiry_activate($uid) {
-  $sql = "UPDATE {users} SET status = 1 WHERE uid = %d";
-  if (db_query($sql, $uid)) {
+  $user = user_load(array('uid' => $uid));
+  $account = user_save($user, array('status' => 1));
+  if ($user->status != $account->status) {
     drupal_set_message(t('Account set to Active for user '. $uid));
   }
   else {