Only override auth when actually necessary