Bug 841269 - always auth AS, backdoor credential changes

The first commit is from my other pull request.  Ignore for review purposes.