s: fix case where shundle is setup in several accounts during the same session