Merge pull request #5901 from WoltLab/reauth