COR-284: Applied the same logic for the DefaultLoginModule