diff --git a/core/src/com/cloud/user/dao/AccountDaoImpl.java b/core/src/com/cloud/user/dao/AccountDaoImpl.java
index 1b60f22d2b4..5715ac58515 100644
--- a/core/src/com/cloud/user/dao/AccountDaoImpl.java
+++ b/core/src/com/cloud/user/dao/AccountDaoImpl.java
@@ -174,7 +174,7 @@ public class AccountDaoImpl extends GenericDaoBase<AccountVO, Long> implements A
 	
 	@Override
 	public void markForCleanup(long accountId) {
-		AccountVO account = findById(accountId);
+		AccountVO account = findByIdIncludingRemoved(accountId);
 		if (!account.getNeedsCleanup()) {
 			account.setNeedsCleanup(true);
         	update(accountId, account);
diff --git a/utils/src/com/cloud/utils/db/GenericDaoBase.java b/utils/src/com/cloud/utils/db/GenericDaoBase.java
index 53df12503e4..236d49980bb 100755
--- a/utils/src/com/cloud/utils/db/GenericDaoBase.java
+++ b/utils/src/com/cloud/utils/db/GenericDaoBase.java
@@ -1137,7 +1137,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> implements Gene
             }
         }
         
-        return _idField != null ? findById(id) : null;
+        return _idField != null ? findByIdIncludingRemoved(id) : null;
     }
 
     @DB(txn=false)