auth_popup fix
Merge branch 'hotfix_fix_auth_popup'