diff --git a/cron/cleanup.php b/cron/cleanup.php
index 79d592d..5e7000a 100644
--- a/cron/cleanup.php
+++ b/cron/cleanup.php
@@ -62,7 +62,7 @@ function hasDataAssociated($iUserId)
     $ob = mysql_fetch_object($hResult);
     if($ob->c != 0) return true;
 
-    $sQuery = "SELECT count(userId) as c FROM appMaintainerQueue WHERE userId = $iUserId";
+    $sQuery = "SELECT count(userId) as c FROM appMaintainers WHERE userId = $iUserId";
     $hResult = query_appdb($sQuery);
     $ob = mysql_fetch_object($hResult);
     if($ob->c != 0) return true;
diff --git a/include/user.php b/include/user.php
index 59457cf..08ef459 100644
--- a/include/user.php
+++ b/include/user.php
@@ -145,6 +145,7 @@ class User {
         $hResult3 = query_appdb("DELETE FROM user_prefs WHERE userid = '".$this->iUserId."'");
         $hResult4 = query_appdb("DELETE FROM appVotes WHERE userid = '".$this->iUserId."'");
         $hResult5 = query_appdb("DELETE FROM appMaintainers WHERE userid = '".$this->iUserId."'");
+        $hResult6 = query_appdb("DELETE FROM appComments WHERE userId = '".$this->iUserId."'");
         return($hResult = query_appdb("DELETE FROM user_list WHERE userid = '".$this->iUserId."'"));
     }