diff --git a/src/rocketchataccountsettings.cpp b/src/rocketchataccountsettings.cpp
index 7816753d..6cca0cd2 100644
--- a/src/rocketchataccountsettings.cpp
+++ b/src/rocketchataccountsettings.cpp
@@ -1,150 +1,150 @@
 /*
    Copyright (c) 2017-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 "rocketchataccountsettings.h"
 #include "ruqola_debug.h"
 
 #include <QSettings>
 #include <QStandardPaths>
 
 RocketChatAccountSettings::RocketChatAccountSettings(const QString &accountFileName, QObject *parent)
     : QObject(parent)
     , mAccountFileName(accountFileName)
 {
     //TODO use accountname for settings
 }
 
 QString RocketChatAccountSettings::userId() const
 {
     return mUserId;
 }
 
 void RocketChatAccountSettings::setUserId(const QString &userId)
 {
     //Don't use if( m_userID != userID) as we need to Q_EMIT userIDChanged
     mUserId = userId;
     QSettings s;
     s.setValue(QStringLiteral("userID"), userId);
     Q_EMIT userIDChanged();
 }
 
 QString RocketChatAccountSettings::authToken() const
 {
     return mAuthToken;
 }
 
 void RocketChatAccountSettings::setAuthToken(const QString &authToken)
 {
     if (mAuthToken != authToken) {
         qCDebug(RUQOLA_LOG) << "Setting token to" << authToken;
         QSettings s;
         mAuthToken = authToken;
         s.setValue(QStringLiteral("authToken"), authToken);
     }
 }
 
 void RocketChatAccountSettings::logout()
 {
     QSettings s;
     s.setValue(QStringLiteral("authToken"), QString());
     mAuthToken.clear();
     mUserId.clear();
     mPassword.clear();
 }
 
 void RocketChatAccountSettings::loadSettings()
 {
     QSettings s;
-    mServerUrl = s.value(QStringLiteral("serverURL"), QStringLiteral("demo.rocket.chat")).toString();
+    mServerUrl = s.value(QStringLiteral("serverURL"), QStringLiteral("open.rocket.chat")).toString();
     mUserName = s.value(QStringLiteral("username")).toString();
     mUserId = s.value(QStringLiteral("userID")).toString();
     mAuthToken = s.value(QStringLiteral("authToken")).toString();
     mAccountName = s.value(QStringLiteral("accountName")).toString();
 }
 
 QString RocketChatAccountSettings::password() const
 {
     return mPassword;
 }
 
 void RocketChatAccountSettings::setPassword(const QString &password)
 {
     mPassword = password;
 }
 
 QString RocketChatAccountSettings::userName() const
 {
     return mUserName;
 }
 
 void RocketChatAccountSettings::setUserName(const QString &userName)
 {
     if (mUserName != userName) {
         mUserName = userName;
         QSettings s;
         s.setValue(QStringLiteral("username"), mUserName);
         Q_EMIT userNameChanged();
     }
 }
 
 QString RocketChatAccountSettings::accountName() const
 {
     return mAccountName;
 }
 
 void RocketChatAccountSettings::setAccountName(const QString &accountName)
 {
     if (mAccountName == accountName) {
         return;
     }
 
     QSettings s;
     s.setValue(QStringLiteral("accountName"), accountName);
     mAccountName = accountName;
     Q_EMIT accountNameChanged();
 }
 
 QString RocketChatAccountSettings::serverUrl() const
 {
     return mServerUrl;
 }
 
 void RocketChatAccountSettings::setServerUrl(const QString &serverUrl)
 {
     if (mServerUrl == serverUrl) {
         return;
     }
 
     QSettings s;
     s.setValue(QStringLiteral("serverURL"), serverUrl);
     mServerUrl = serverUrl;
     Q_EMIT serverURLChanged();
 }
 
 QString RocketChatAccountSettings::cacheBasePath()
 {
     if (mServerUrl.isEmpty()) {
         return QString();
     }
     if (mCachePath.isEmpty()) {
         mCachePath = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + QLatin1Char('/') + mServerUrl;
     }
     return mCachePath;
 }