[DO NOT REVIEW] Fixes #7089 - Using #scoped method in the auth code