Follow-up to #17383: Open forms cannot be saved after "Relogin" (Security Token errors)