better working solution for only auth auto-saves