Non-blocking auth

This pull request is for ticket #4137; I'm opening it just so I can type up Jaime's review notes.