I am using OS X Keychain as my password manager. To make it reasonably secure, I have a different password on my login keychain than on my user account, and have the keychain set to lock automatically after 5 minutes or on sleep.
On the whole this works well, with one exception. At home, my wireless works without needing to unlock the login keychain, since the password is stored on the "system" keychain, which has the same password as my user account. However, at work, the wireless password is stored on the "login" keychain, and so requires me to enter the keychain password before it will connect. The difference between the two seems to be that the home system is WPA2 Personal and the work one is WPA2 Enterprise.
This problem has been compounded since upgrading to OSX 10.9. Now, wireless access at work requires me to enter the keychain password TWICE: once so that "eapolclient" can access the login keychain, and a second time so that Keychain Access can access the login keychain.
I have tried moving the WPA2 Enterprise password item from the login keychain to the system keychain, but it seems to ignore it. So my question is:
Is there any way of persuading OS X to read a WPA2 Enterprise wireless password from the system keychain, rather than from the login keychain?
If not, is there any way of avoiding needing to enter the keychain password twice, as in OS X 10.8 and earlier?