Merge pull request #482 from leider/master

Fix for #481. It was introduced by the ability to use more than one auth...