QAART-265 force login refactoring