Merge pull request #9 from HaraldTR/fix/pwa-token-adoption