diff --git a/api/restapi.cpp b/api/restapi.cpp
index 10716def7c19af4e074310885e6034b57781cbaa..352033e9f610f018127ad3dcb7d7397ea7a2115f 100755
--- a/api/restapi.cpp
+++ b/api/restapi.cpp
@@ -21,7 +21,7 @@
 
 #include "restapi.h"
 
-RestApi::RestApi( QObject *parent, const QString &pBaseUrl, const QString &pApiUri ) : QObject( parent ),  mApiUri( pBaseUrl + pApiUri ), mBaseUrl( pBaseUrl )
+RestApi::RestApi( QObject *parent, const QString &pBaseUrl ) : QObject( parent ),  mApiUrl( pBaseUrl + mApiPath ), mBaseUrl( pBaseUrl )
 {
     qRegisterMetaType<RestApiRequest>( "RestApiRequest" );
 }
@@ -48,7 +48,7 @@ void RestApi::init()
 void RestApi::login( const QString &pUsername, const QString &pPassword )
 {
     if ( pUsername.length() && pPassword.length() ) {
-        QUrl url = QString( mApiUri + mApiLogin );
+        QUrl url = QString( mApiUrl + mApiLogin );
         QByteArray data;
         data.append( "user=" + pUsername + "&" );
         data.append( "password=" + pPassword );
@@ -59,7 +59,7 @@ void RestApi::login( const QString &pUsername, const QString &pPassword )
         QNetworkRequest request;
         request.setHeader( QNetworkRequest::ContentTypeHeader, QString( QStringLiteral( "application/x-www-form-urlencoded" ) ) );
         request.setUrl( url );
-        qDebug() << "send rest api login to " + mApiUri + mApiLogin;
+        qDebug() << "send rest api login to " + mApiUrl + mApiLogin;
         mNetworkReplies[mNam->post( request, data )] = methods::LOGIN;
     } else {
         mLoginErrorString = QStringLiteral( "no username or password provided" );
@@ -72,7 +72,7 @@ void RestApi::login( const QString &pUsername, const QString &pPassword )
 
 void RestApi::logout()
 {
-    QUrl url = QString( mApiUri + mApiLogoff );
+    QUrl url = QString( mApiUrl + mApiLogoff );
     QNetworkRequest request;
     request.setUrl( url );
     request.setRawHeader( QByteArray( QByteArrayLiteral( "X-Auth-Token" ) ), QByteArray( mToken.toLocal8Bit() ) );
@@ -343,7 +343,7 @@ void RestApi::sendRequestSlot( const RestApiRequest &pRequest )
         QString path;
 
         if ( !pRequest->getAbsolutePath() ) {
-            path = mApiUri + pRequest->getPath();
+            path = mApiUrl + pRequest->getPath();
         } else {
             path = pRequest->getPath();
         }
diff --git a/api/restapi.h b/api/restapi.h
index e2f82f7a2c255f73d1ec69d61e324506172d488e..18a4e19c557edfbca3b31f6ece7bbcdddeb843cb 100755
--- a/api/restapi.h
+++ b/api/restapi.h
@@ -55,7 +55,7 @@ class RestApi: public QObject
         Q_OBJECT
 
     public:
-        RestApi( QObject *parent, const QString &pBaseUrl, const QString &pApiUri );
+        RestApi( QObject *parent, const QString &pBaseUrl );
         void login( const QString &pUsername, const QString &pPassword );
         void logout();
         QString getName() const;
@@ -94,7 +94,8 @@ class RestApi: public QObject
         QString mToken = "";
         QString mUserId = "";
 
-        QString mApiUri = "";
+        QString mApiPath = QStringLiteral( "/api/v1" );
+        QString mApiUrl = "";
         QString mBaseUrl = "";
         QString mApiLogin = "";
         QString mApiLogoff = "";
diff --git a/rocketchatserver.cpp b/rocketchatserver.cpp
index 535840d70564260c58bf1b947a3030d59294aa64..5a720fd0711706717aef9f3053525ffd71c9aea0 100755
--- a/rocketchatserver.cpp
+++ b/rocketchatserver.cpp
@@ -62,7 +62,7 @@ RocketChatServerData::RocketChatServerData( const QString &pId, QString pBaseUrl
     };
     mFileService = new FileService( this );
     mEmojiService = new EmojiService( this, mFileService, mStorage );
-    setRestApi( new RestApi( this, protocol + mBaseUrl, mApiUri ) );
+    setRestApi( new RestApi( this, protocol + mBaseUrl ) );
 }
 
 void RocketChatServerData::init()