Fixed authentication check, scope