OZP-64: Changing login flow to work better with FF 17