Simplify auth, remove infinite redirect