bug 893: A bit more efficiency in account_delete()