Updated auto-auth