Fixed some token-store logic

Merge request reports

Loading