Fixing account without owner issue #68689