Login credentials have expired with login verification

I recently updated my account, changing my gamer tag and adding the "Login Verification" security option to my account.  I have no trouble loggin in, but each time I log in through the Origin client I get the message that my credentials have expired, and I have to enter a new security code each time.  Launching Battlelog directly from my browser instead avoids this problem, and launching my game from there does not require another login or security code.

Seems that this system needs a bit more fine-tuning.  I would like the added security but doing a code each time is quite annoying.