Yes. Unfortunately our flow is missing that. We've been flogging our team for missing that.
It's on our list of things to do.
If you have PSN 2-factor enabled, we kindly ask that you disable it, connect your account, and then turn it back on if you wish. You will not have to worry about it again unless your remove your PSN connection and try to add again before we have a fix.
And yes, I know it's a royal pain, but appreciate your patience!