Fix #1554 Problem with authentication flow
Merge pull request #733 from nlegoff/fix_cgu_link

[3.8] Fix #1554 Problem with authentication flow