Updated Login Flow for Customer's expectations merged with current code base