Tweaks to auth setup part 2