Move around the auth key lookup and don't prompt when invalid