[Bug 297545] Improve handling of VPN/PPTP