Login flow improved