Moved C2 auth logic to before filter