TQA-1542: improve logout action