diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7c2f61bb..b0ffe0ad 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,244 +1,245 @@
 
 set (Ruqola_restapi_SRCS
     restapi/restapirequest.cpp
     restapi/restapiutil.cpp
     restapi/restapimethod.cpp
     restapi/uploadfilejob.cpp
     restapi/restapiabstractjob.cpp
 
     restapi/spotlightjob.cpp
 
     restapi/serverinfojob.cpp
 
     restapi/misc/owninfojob.cpp
     restapi/misc/settingsoauthjob.cpp
 
     restapi/users/getavatarjob.cpp
     restapi/users/setavatarjob.cpp
     restapi/users/forgotpasswordjob.cpp
     restapi/users/usersinfojob.cpp
     restapi/users/getpresencejob.cpp
+    restapi/users/resetavatarjob.cpp
 
     restapi/authentication/logoutjob.cpp
     restapi/authentication/loginjob.cpp
     restapi/authentication/facebookauthjob.cpp
     restapi/authentication/googleauthjob.cpp
     restapi/authentication/twitterauthjob.cpp
 
     restapi/settings/privateinfojob.cpp
 
     restapi/channellistjob.cpp
     restapi/downloadfilejob.cpp
 
     restapi/emoji/loademojicustomjob.cpp
 
     restapi/chat/starmessagejob.cpp
     restapi/chat/pinmessagejob.cpp
     restapi/chat/postmessagejob.cpp
     restapi/chat/deletemessagejob.cpp
     restapi/chat/updatemessagejob.cpp
     restapi/chat/reactonmessagejob.cpp
     restapi/chat/searchmessagejob.cpp
     restapi/chat/ignoreuserjob.cpp
     restapi/chat/reportmessagejob.cpp
 
     restapi/channels/changechanneltopicjob.cpp
     restapi/channels/changechannelannouncementjob.cpp
     restapi/channels/changechannelnamejob.cpp
     restapi/channels/createchanneljob.cpp
     restapi/channels/leavechanneljob.cpp
     restapi/channels/channelclosejob.cpp
     restapi/channels/channelhistoryjob.cpp
     restapi/channels/changechanneldescriptionjob.cpp
     restapi/channels/changechannelreadonlyjob.cpp
     restapi/channels/archivechanneljob.cpp
     restapi/channels/channelfilesjob.cpp
     restapi/channels/channelinvitejob.cpp
     restapi/channels/setjoincodechanneljob.cpp
     restapi/channels/channelremoveownerjob.cpp
 
     restapi/groups/changegroupstopicjob.cpp
     restapi/groups/changegroupsannouncementjob.cpp
     restapi/groups/changegroupsnamejob.cpp
     restapi/groups/creategroupsjob.cpp
     restapi/groups/leavegroupsjob.cpp
     restapi/groups/changegroupsdescriptionjob.cpp
     restapi/groups/archivegroupsjob.cpp
     restapi/groups/groupsinvitejob.cpp
     restapi/groups/groupskickjob.cpp
 
     restapi/directmessage/createdmjob.cpp
 
     restapi/rooms/savenotificationjob.cpp
     restapi/rooms/getroomsjob.cpp
     restapi/rooms/roomfavoritejob.cpp
 
     restapi/subscriptions/markroomasreadjob.cpp
     restapi/subscriptions/markroomasunreadjob.cpp
     )
 
 set(Ruqola_ddpapi_SRCS
     ddpapi/ddpclient.cpp
     )
 
 set (Ruqola_model_core_srcs    
     model/messagemodel.cpp
     model/roommodel.cpp
     model/roomfilterproxymodel.cpp
 
     model/usersforroommodel.cpp
     model/usersforroomfilterproxymodel.cpp
 
     model/usersmodel.cpp
 
     model/usercompleterfilterproxymodel.cpp
     model/usercompletermodel.cpp
 
     model/statusmodel.cpp
 
     model/filesforroommodel.cpp
     model/filesforroomfilterproxymodel.cpp
 
     model/searchchannelmodel.cpp
     model/searchchannelfilterproxymodel.cpp
 
     model/inputcompletermodel.cpp
 
     model/loginmethodmodel.cpp
 
     model/searchmessagemodel.cpp
     model/searchmessagefilterproxymodel.cpp
 
     model/rocketchataccountmodel.cpp
     model/rocketchataccountfilterproxymodel.cpp
 
     )
 
 set(Ruqola_plugins_srcs
     plugins/pluginauthenticationinterface.cpp
     plugins/pluginauthentication.cpp
     )
 
 set(Ruqola_aboutdata_srcs
     aboutdata/qmlaboutdata.cpp
     aboutdata/qmlaboutdataauthormodel.cpp
     )
 
 set (Ruqola_core_srcs
     ${Ruqola_model_core_srcs}
     ${Ruqola_plugins_srcs}
     ${Ruqola_aboutdata_srcs}
     ${Ruqola_ddpapi_SRCS}
     ${Ruqola_restapi_SRCS}
     authenticationinfo.cpp
     message.cpp
     room.cpp
     roomwrapper.cpp
     notificationoptionswrapper.cpp
     ruqola.cpp
     ruqolautils.cpp
     rocketchatbackend.cpp
     notification.cpp
     messagequeue.cpp
     rocketchatmessage.cpp
     typingnotification.cpp
     changetemporarystatus.cpp
     user.cpp
     utils.cpp
     emoji.cpp
     emojimanager.cpp
     clipboardproxy.cpp
     otr.cpp
     otrmanager.cpp
     abstractwebsocket.cpp
     ruqolawebsocket.cpp
     messageattachment.cpp
     messageurl.cpp
     rocketchataccount.cpp
     rocketchataccountsettings.cpp
     ruqolalogger.cpp
     ruqolaregisterengine.cpp
     ruqolaserverconfig.cpp
     rocketchatcache.cpp
     texthighlighter.cpp
     textconverter.cpp
     loadrecenthistorymanager.cpp
     file.cpp
     channel.cpp
     inputtextmanager.cpp
     authenticationmanager.cpp
     searchmessage.cpp
 
     accountmanager.cpp
     managerdatapaths.cpp
 
     notificationoptions.cpp
 
     reactions.cpp
     reaction.cpp
     syntaxhighlightingmanager.cpp
     copyfilejob.cpp
 )
 
 if (NOT WIN32)
     set(Ruqola_core_srcs ${Ruqola_core_srcs} unityservicemanager.cpp)
 endif()
 
 
 ecm_qt_declare_logging_category(Ruqola_core_srcs HEADER ruqola_debug.h IDENTIFIER RUQOLA_LOG CATEGORY_NAME org.kde.ruqola)
 ecm_qt_declare_logging_category(Ruqola_core_srcs HEADER ruqola_message_debug.h IDENTIFIER RUQOLA_MESSAGE_LOG CATEGORY_NAME org.kde.ruqola.message)
 ecm_qt_declare_logging_category(Ruqola_core_srcs HEADER ruqola_ddpapi_debug.h IDENTIFIER RUQOLA_DDPAPI_LOG CATEGORY_NAME org.kde.ruqola.ddpapi)
 ecm_qt_declare_logging_category(Ruqola_core_srcs HEADER ruqola_ddpapi_command_debug.h IDENTIFIER RUQOLA_DDPAPI_COMMAND_LOG CATEGORY_NAME org.kde.ruqola.ddpapi.command)
 ecm_qt_declare_logging_category(Ruqola_core_srcs HEADER ruqola_restapi_debug.h IDENTIFIER RUQOLA_RESTAPI_LOG CATEGORY_NAME org.kde.ruqola.restapi)
 
 add_library(libruqolacore ${Ruqola_core_srcs})
 
 generate_export_header(libruqolacore BASE_NAME libruqolacore)
 
 target_link_libraries(libruqolacore
     Qt5::Core
     Qt5::Gui
     Qt5::Widgets
     Qt5::Qml
     Qt5::Quick
     Qt5::WebSockets
     Qt5::Network
     Qt5::NetworkAuth
     KF5::CoreAddons
     KF5::I18n
     KF5::Crash
     KF5::Notifications
     KF5::SyntaxHighlighting
 )
 
 if (NOT WIN32)
     target_link_libraries(libruqolacore Qt5::DBus)
 endif()
 
 if (WIN32 OR APPLE)
     target_link_libraries(libruqolacore KF5::IconThemes)
 endif()
 
 if (Qt5Keychain_FOUND)
     target_link_libraries(libruqolacore qt5keychain)
     target_include_directories(libruqolacore PRIVATE ${QTKEYCHAIN_INCLUDE_DIRS})
 endif()
 
 set_target_properties(libruqolacore
     PROPERTIES OUTPUT_NAME ruqolacore VERSION ${RUQOLA_LIB_VERSION} SOVERSION ${RUQOLA_LIB_SOVERSION}
     )
 
 qt5_add_resources(RuqolaResources qml/qml.qrc)
 
 add_executable(ruqola main.cpp ${RuqolaResources})
 
 target_link_libraries(ruqola libruqolacore)
 
 install(TARGETS ruqola ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 install(TARGETS libruqolacore ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
 
 install(PROGRAMS data/org.kde.ruqola.desktop DESTINATION ${KDE_INSTALL_APPDIR})
 install(FILES data/org.kde.ruqola.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
 
 add_subdirectory(plugins)
 add_subdirectory(icons)
diff --git a/src/restapi/users/resetavatarjob.cpp b/src/restapi/users/resetavatarjob.cpp
new file mode 100644
index 00000000..badd40ca
--- /dev/null
+++ b/src/restapi/users/resetavatarjob.cpp
@@ -0,0 +1,108 @@
+/*
+   Copyright (c) 2018 Montel Laurent <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 "resetavatarjob.h"
+#include "restapimethod.h"
+#include "ruqola_restapi_debug.h"
+
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QNetworkReply>
+
+ReSetAvatarJob::ReSetAvatarJob(QObject *parent)
+    : RestApiAbstractJob(parent)
+{
+}
+
+ReSetAvatarJob::~ReSetAvatarJob()
+{
+}
+
+bool ReSetAvatarJob::start()
+{
+    if (!canStart()) {
+        deleteLater();
+        return false;
+    }
+    const QByteArray baPostData = json().toJson(QJsonDocument::Compact);
+    addLoggerInfo("ReSetAvatarJob::start: " + baPostData);
+    QNetworkReply *reply = mNetworkAccessManager->post(request(), baPostData);
+    connect(reply, &QNetworkReply::finished, this, &ReSetAvatarJob::slotSetAvatar);
+    return true;
+}
+
+void ReSetAvatarJob::slotSetAvatar()
+{
+    QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender());
+    if (reply) {
+        const QByteArray data = reply->readAll();
+        addLoggerInfo(QByteArrayLiteral("ReSetAvatarJob: finished: ") + data);
+        Q_EMIT setAvatarDone();
+    }
+    deleteLater();
+}
+
+QString ReSetAvatarJob::avatarUserId() const
+{
+    return mAvatarUserId;
+}
+
+void ReSetAvatarJob::setAvatarUserId(const QString &avatarUserId)
+{
+    mAvatarUserId = avatarUserId;
+}
+
+bool ReSetAvatarJob::requireHttpAuthentication() const
+{
+    return true;
+}
+
+bool ReSetAvatarJob::canStart() const
+{
+    if (!RestApiAbstractJob::canStart()) {
+        qCWarning(RUQOLA_RESTAPI_LOG) << "Impossible to start ReSetAvatarJob";
+        return false;
+    }
+    if (mAvatarUserId.isEmpty()) {
+        qCWarning(RUQOLA_RESTAPI_LOG) << "ReSetAvatarJob: mAvatarUserId is empty";
+        return false;
+    }
+    return true;
+}
+
+QNetworkRequest ReSetAvatarJob::request() const
+{
+    const QUrl url = mRestApiMethod->generateUrl(RestApiUtil::RestApiUrlType::UsersResetAvatar);
+    QNetworkRequest request(url);
+    addAuthRawHeader(request);
+    request.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true);
+    request.setAttribute(QNetworkRequest::HTTP2AllowedAttribute, true);
+    request.setHeader(QNetworkRequest::ContentTypeHeader, QStringLiteral("application/json"));
+    return request;
+}
+
+QJsonDocument ReSetAvatarJob::json() const
+{
+    QJsonObject jsonObj;
+    jsonObj[QLatin1String("userId")] = mAvatarUserId;
+
+    const QJsonDocument postData = QJsonDocument(jsonObj);
+    return postData;
+}
diff --git a/src/restapi/users/resetavatarjob.h b/src/restapi/users/resetavatarjob.h
new file mode 100644
index 00000000..84bdd3da
--- /dev/null
+++ b/src/restapi/users/resetavatarjob.h
@@ -0,0 +1,53 @@
+/*
+   Copyright (c) 2018 Montel Laurent <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.
+*/
+
+#ifndef ReSetAvatarJob_H
+#define ReSetAvatarJob_H
+
+#include "restapiabstractjob.h"
+#include "libruqola_private_export.h"
+
+class LIBRUQOLACORE_TESTS_EXPORT ReSetAvatarJob : public RestApiAbstractJob
+{
+    Q_OBJECT
+public:
+    explicit ReSetAvatarJob(QObject *parent = nullptr);
+    ~ReSetAvatarJob() override;
+
+    Q_REQUIRED_RESULT bool start() override;
+    Q_REQUIRED_RESULT bool requireHttpAuthentication() const override;
+    Q_REQUIRED_RESULT bool canStart() const override;
+    Q_REQUIRED_RESULT QNetworkRequest request() const override;
+
+    Q_REQUIRED_RESULT QJsonDocument json() const;
+
+    Q_REQUIRED_RESULT QString avatarUserId() const;
+    void setAvatarUserId(const QString &avatarUserId);
+
+Q_SIGNALS:
+    void setAvatarDone();
+
+private:
+    Q_DISABLE_COPY(ReSetAvatarJob)
+    void slotSetAvatar();
+    QString mAvatarUserId;
+};
+
+#endif // ReSetAvatarJob_H