SWC-1411: profile page tokens
Merge pull request #980 from jay-hodgson/SWC-1411

SWC-1411: profile page tokens