[FIX] Post-rebase fixes related to external auth