Fix first-time auth issues
Merge pull request #209 from NESCent/fix-auth

Fix first-time auth issues