Fixes #7089 - Using #scoped method in the auth code
Merge pull request #4582 from daviddavis/temp/20140814111517

Fixes #7089 - Using #scoped method in the auth code