diff --git a/src/core/model/rocketchataccountmodel.cpp b/src/core/model/rocketchataccountmodel.cpp
index b59813d5..a2e313a1 100644
--- a/src/core/model/rocketchataccountmodel.cpp
+++ b/src/core/model/rocketchataccountmodel.cpp
@@ -1,162 +1,162 @@
 /*
    Copyright (c) 2018-2020 Laurent Montel <montel@kde.org>
 
    This library is free software; you can redistribute it and/or modify
    it under the terms of the GNU Library General Public License as published
    by the Free Software Foundation; either version 2 of the License or
    ( at your option ) version 3 or, at the discretion of KDE e.V.
    ( which shall act as a proxy as in section 14 of the GPLv3 ), any later version.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
 
 #include "rocketchataccountmodel.h"
 #include "rocketchataccount.h"
 #include "ruqolaserverconfig.h"
 #include "ruqola_debug.h"
 
 RocketChatAccountModel::RocketChatAccountModel(QObject *parent)
     : QAbstractListModel(parent)
 {
 }
 
 RocketChatAccountModel::~RocketChatAccountModel()
 {
     qDeleteAll(mRocketChatAccount);
 }
 
 void RocketChatAccountModel::clear()
 {
     if (!mRocketChatAccount.isEmpty()) {
         beginRemoveRows(QModelIndex(), 0, rowCount() - 1);
         qDeleteAll(mRocketChatAccount);
         mRocketChatAccount.clear();
         endRemoveRows();
     }
     Q_EMIT accountNumberChanged();
 }
 
 void RocketChatAccountModel::setAccounts(const QVector<RocketChatAccount *> &accounts)
 {
     if (rowCount() != 0) {
         beginRemoveRows(QModelIndex(), 0, mRocketChatAccount.count() - 1);
         mRocketChatAccount.clear();
         endRemoveRows();
     }
     if (!accounts.isEmpty()) {
         beginInsertRows(QModelIndex(), 0, accounts.count() - 1);
         mRocketChatAccount = accounts;
         endInsertRows();
     }
     Q_EMIT accountNumberChanged();
 }
 
 RocketChatAccount *RocketChatAccountModel::account(const QString &accountName) const
 {
     if (mRocketChatAccount.isEmpty()) {
         qCWarning(RUQOLA_LOG) << " Empty account";
         return nullptr;
     }
     for (int i = 0, total = mRocketChatAccount.count(); i < total; ++i) {
         RocketChatAccount *model = mRocketChatAccount.at(i);
         if (model->accountName() == accountName) {
             return model;
         }
     }
     return nullptr;
 }
 
 int RocketChatAccountModel::accountNumber() const
 {
     return mRocketChatAccount.count();
 }
 
 QStringList RocketChatAccountModel::accountsName() const
 {
     QStringList accounts;
     for (int i = 0, total = mRocketChatAccount.count(); i < total; ++i) {
         RocketChatAccount *model = mRocketChatAccount.at(i);
         accounts << model->accountName();
     }
     return accounts;
 }
 
 RocketChatAccount *RocketChatAccountModel::account(int index) const
 {
     if (mRocketChatAccount.isEmpty() || (index > mRocketChatAccount.count() - 1)) {
         qCWarning(RUQOLA_LOG) << " Empty account";
         return nullptr;
     }
     return mRocketChatAccount.at(index);
 }
 
 int RocketChatAccountModel::rowCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent)
     return mRocketChatAccount.count();
 }
 
 QVariant RocketChatAccountModel::data(const QModelIndex &index, int role) const
 {
     if (!index.isValid()) {
         qCWarning(RUQOLA_LOG) << "ERROR: invalid index";
         return {};
     }
     const int idx = index.row();
     RocketChatAccount *account = mRocketChatAccount.at(idx);
     switch (role) {
     case Qt::DisplayRole:
     case Name:
         return account->accountName();
     case SiteUrl:
         return account->ruqolaServerConfig()->siteUrl();
     case UserName:
         return account->userName();
     }
     //Add icon ???
     return {};
 }
 
 void RocketChatAccountModel::insertAccount(RocketChatAccount *account)
 {
     //Verify that we have it ?
     const int accountCount = mRocketChatAccount.count();
     beginInsertRows(QModelIndex(), accountCount, accountCount);
     mRocketChatAccount.append(account);
     endInsertRows();
     Q_EMIT accountNumberChanged();
 }
 
 void RocketChatAccountModel::removeAccount(const QString &name)
 {
     //qDebug() << " void RocketChatAccountModel::removeAccount(const QString &name)"<<name;
     //Search account.
-    for (int i = 0; i < mRocketChatAccount.count(); ++i) {
+    for (int i = 0, total = mRocketChatAccount.count(); i < total; ++i) {
         if (mRocketChatAccount.at(i)->accountName() == name) {
             beginRemoveRows(QModelIndex(), i, i);
             RocketChatAccount *account = mRocketChatAccount.takeAt(i);
             account->removeSettings();
             delete account;
             endRemoveRows();
             Q_EMIT accountNumberChanged();
             break;
         }
     }
 }
 
 QHash<int, QByteArray> RocketChatAccountModel::roleNames() const
 {
     QHash<int, QByteArray> roles;
     roles[Name] = QByteArrayLiteral("name");
     roles[SiteUrl] = QByteArrayLiteral("siteurl");
     roles[UserName] = QByteArrayLiteral("username");
     return roles;
 }