Fixing accounts without owner issue #68689