Better flow for Authentication