Improved login flow, fixed conversation flow