Made reliability improvements to auth flow