wicd is an alternative network manager that seems to relieve a lot of the problems that NetworkManager had.
Install wicd
Then edit or create an encryption template "psu" as /etc/wicd/encryption/templates/psu. Note that this file may exist already but is probably outdated (as of today, mine was outdated). Find my version of the psu encryption template here: https://bitbucket.org/zachwolfe/dotfiles/src/2dc9a24fbc7b/etc/wicd/encryption/templates/psu
Then open the wicd-gtk client and connect to the "psu" network using the "psu" encryption template you just defined. You should also select the "use these settings for all networks sharing this essid" checkbox as well for obvious reasons.