fixed login flow