repairs so OAuth flow doesn't get stuck after an error
Merge pull request #3088 from birarda/master

repairs so OAuth flow doesn't get stuck after error