Avoid extra pre-auth api requests

Close #1586