Fixes #6167 - Make sure user has access to both river object and target.