Defaulting Rule-Scheduled Ship Date issue

We have some defaulting rules set up to where some orgs/line types default a scheduled ship date that is 75 days out, and other where the scheduled ship date is null up until the order is booked, then it is sys date.  The issue is, this is not working for 1 particular org.  In the past, this rule was set up as org specific, but we now have 1 org that both of these rules need to apply, depending on the line type.  I set up 1 defaulting rule that says OrgA and Line Type A = Sys Variable null when both parameters exist...