8 Commit (auth_API_bug_fix)