Fix for expunge accounts