Fixed nav#2831
No tokens for registration messages #2353
Merge branch 'SCHOLAR-3.6' into 2353-reg_tokens
Merge pull request #3078 from openscholar/2353-reg_tokens

2353 reg tokens