Fixed Auth Failure Redirect + more