Improve auth push