openvpn & mate-keyring: can't save vpn pasword or "Default"

[luherblissett]

I recently did a fresh install of LMDE (mate-cinnamon-201204) and directly installed UP5, maybe foolishly selecting "yes" on all the replacement prompts. Everything seems to be working fine except for network manager not being able to save my openvpn password although all other settings on network manager are saved correctly. Also mate-keyring-prompt asks me to set a new "Default" keyring password every time I manually enter the vpn password again. I'm thinking this is either related to gnome-keyring and mate-keyring conflicting in the openvpn config, or the wrong file being replaced during the update. Any suggestions on how I can fix this?