Improve scenario with more than one line for same user