Actually, irregardless if you have pre-ordered, I am pretty sure that activation fee is going to still be $36. It's an activation fee, so basically once your phone is activated then that fee will go on your bill. So everyone that just ordered, I believe, will have this higher fee on their bill. There are some protests going around on change.org about it. So, go on there and sign every one that you see!
True, the activation fee has always been $36, but prior to today the upgrade fee was $18 and unless I misunderstood the OP, I believe he was doing an upgrade, not activating a new line.