Fix bug with organization always being set in update