diff --git a/src/core/ddpapi/ddpclient.h b/src/core/ddpapi/ddpclient.h
--- a/src/core/ddpapi/ddpclient.h
+++ b/src/core/ddpapi/ddpclient.h
@@ -94,11 +94,6 @@
     */
     Q_INVOKABLE void login();
 
-    /**
-    * @brief Closes the websocket connection
-    */
-    void logOut();
-
     /**
     * @brief Check whether websocket is connected at url
     *
diff --git a/src/core/ddpapi/ddpclient.cpp b/src/core/ddpapi/ddpclient.cpp
--- a/src/core/ddpapi/ddpclient.cpp
+++ b/src/core/ddpapi/ddpclient.cpp
@@ -217,6 +217,7 @@
 
 DDPClient::~DDPClient()
 {
+    disconnect(mWebSocket, &AbstractWebSocket::disconnected, this, &DDPClient::onWSclosed);
     mWebSocket->close();
     //Don't delete socket when we use specific socket.
     if (!RuqolaTestWebSocket::_k_ruqola_webSocket) {
diff --git a/src/core/rocketchataccount.cpp b/src/core/rocketchataccount.cpp
--- a/src/core/rocketchataccount.cpp
+++ b/src/core/rocketchataccount.cpp
@@ -1934,9 +1934,6 @@
 
 void RocketChatAccount::slotDisconnectedByServer()
 {
-    //Laurent: disable it for the moment otherwise when we logout we are unable to add password in login page. Need to improve it first :)
-
-    return;
     // This happens when we didn't react to pings for a while
     // (e.g. while stopped in gdb, or if network went down for a bit)
     // Let's try connecting in again
diff --git a/src/core/rocketchataccountsettings.cpp b/src/core/rocketchataccountsettings.cpp
--- a/src/core/rocketchataccountsettings.cpp
+++ b/src/core/rocketchataccountsettings.cpp
@@ -176,7 +176,6 @@
     mSetting->sync();
     mAuthToken.clear();
     mUserId.clear();
-    mPassword.clear();
     mExpireToken = -1;
 }
 
diff --git a/src/rocketchatrestapi-qt5/authentication/logoutjob.cpp b/src/rocketchatrestapi-qt5/authentication/logoutjob.cpp
--- a/src/rocketchatrestapi-qt5/authentication/logoutjob.cpp
+++ b/src/rocketchatrestapi-qt5/authentication/logoutjob.cpp
@@ -46,7 +46,7 @@
     QNetworkReply *reply = mNetworkAccessManager->get(request());
     addLoggerInfo("LogoutJob::start");
     connect(reply, &QNetworkReply::finished, this, &LogoutJob::slotLogout);
-    return false;
+    return true;
 }
 
 void LogoutJob::slotLogout()
@@ -60,7 +60,7 @@
 
         if (replyObject[QStringLiteral("status")].toString() == QLatin1String("success")) {
             qCDebug(ROCKETCHATQTRESTAPI_LOG) << " Logout";
-            Q_EMIT logoutDone();
+            Q_EMIT logoutDone(); // connected to RestApiRequest::slotLogout
         } else {
             emitFailedMessage(replyObject, reply);
             addLoggerWarning("Error during to logout" + data);
diff --git a/src/rocketchatrestapi-qt5/restapiabstractjob.cpp b/src/rocketchatrestapi-qt5/restapiabstractjob.cpp
--- a/src/rocketchatrestapi-qt5/restapiabstractjob.cpp
+++ b/src/rocketchatrestapi-qt5/restapiabstractjob.cpp
@@ -89,7 +89,7 @@
         return false;
     }
     if (!mRestApiMethod) {
-        qCWarning(ROCKETCHATQTRESTAPI_LOG) << "RestaApiMethod not defined";
+        qCWarning(ROCKETCHATQTRESTAPI_LOG) << "RestApiMethod not defined";
         return false;
     }
     if (requireHttpAuthentication() && !hasAuthenticationValue()) {
diff --git a/src/rocketchatrestapi-qt5/restapirequest.h b/src/rocketchatrestapi-qt5/restapirequest.h
--- a/src/rocketchatrestapi-qt5/restapirequest.h
+++ b/src/rocketchatrestapi-qt5/restapirequest.h
@@ -180,7 +180,6 @@
 Q_SIGNALS:
     void avatar(const QString &userId, const QString &url);
     void redownloadAvatar();
-    void logoutDone();
     void loginDone(const QString &authToken, const QString &userId);
     void downloadFileDone(const QByteArray &data, const QUrl &url, bool useCache, const QUrl &localFileUrl);
     void getServerInfoDone(const QString &version);
diff --git a/src/rocketchatrestapi-qt5/restapirequest.cpp b/src/rocketchatrestapi-qt5/restapirequest.cpp
--- a/src/rocketchatrestapi-qt5/restapirequest.cpp
+++ b/src/rocketchatrestapi-qt5/restapirequest.cpp
@@ -288,7 +288,6 @@
 {
     mUserId.clear();
     mAuthToken.clear();
-    Q_EMIT logoutDone();
 }
 
 void RestApiRequest::initializeRestApiJob(RocketChatRestApi::RestApiAbstractJob *job)