I've been using a BB Curve for 3 days now and my *639# still says eligible for 2 years blah blah
I changed to an unlocked Blackberry Storm for the past week and even changed to the Blackberry data plan and still get the message that I'm eligible for an upgrade with the $18 fee waived. I don't think it matters.