while you are on OPT, you are still F1.The school that issued you the new I-20 will know what to do..Why don't you just ask them?