Did you setup 2 profiles, one for work and one for home? Or do you just have a single 'auto' profile?
I had the same issue, but then just set a specific profile for both work and home, when you click connect it prompts you for which to use and I haven't had any trouble since (and have added 2 friends home connections as well).