some fixes to make immediate auth actually work