Re-order login steps to fix switching between google accounts not working