Yep, I think that would be ideal. That way everyone could have it work they way they expect but still have access to the other choice, if they need it (without having to worry about what it will do the next time after opting for the other choice, which is what would make my initial suggestion no good).