[wip/ticket/12413-3] Fix: remove extra login and use correct variable