Hotfix: Correct issues with authentication & site pivoting