Fix user's displayName being overwritten by (old) cookie
Merge pull request #6199 from nicokaiser/fix-5306-master

Fix user's displayName being overwritten by (old) cookie. #3694