APN for VPN (Fido)

Hi, this is a great site - well organized and the unlockit tool is easy to use.

I have a Telstra unlocked 3GS that I use on Fido in Canada. It has been upgraded to OS4. Until I performed the upgrade and also a carrier settings update from Fido a few days ago, my L2TP VPN worked fine. I consider myself lucky because Fido (and its parent Rogers) have been blocking VPN traffic for over 6 months.

I can change my APN using Unlockit. I have tried the two "CA-Fido" entries on Unlockit. The first one works for data connections, but still no VPN (even after reboot). The second one does not work for data at all - iPhone message says I have no cellular data plan.

I believe I just need to find the appropriate APN values for Fido to get it working.