Fix new auth system timeout bugs (SF bug#1469462).