Fixing env variable handling
Tweak
Merge pull request #224 from mozilla/auth-fixes

Auth fixes