diff --git a/libnymea-remoteproxy/proxyconfiguration.cpp b/libnymea-remoteproxy/proxyconfiguration.cpp
index f2d739a..cc24606 100644
--- a/libnymea-remoteproxy/proxyconfiguration.cpp
+++ b/libnymea-remoteproxy/proxyconfiguration.cpp
@@ -27,12 +27,10 @@ bool ProxyConfiguration::loadConfiguration(const QString &fileName)
     QSettings settings(fileName, QSettings::IniFormat);
     qCDebug(dcApplication()) << settings.childGroups();
 
-    settings.beginGroup("General");
     setWriteLogFile(settings.value("writeLogs", false).toBool());
     setLogFileName(settings.value("logFile", "/var/log/nymea-remoteproxy.log").toString());
     setSslCertificateFileName(settings.value("certificate", "/etc/ssl/certs/ssl-cert-snakeoil.pem").toString());
     setSslCertificateKeyFileName(settings.value("certificateKey", "/etc/ssl/private/ssl-cert-snakeoil.key").toString());
-    settings.endGroup();
 
     settings.beginGroup("WebSocketServer");
     setWebSocketServerHost(QHostAddress(settings.value("host", "127.0.0.1").toString()));
@@ -74,7 +72,7 @@ QString ProxyConfiguration::sslCertificateFileName() const
 
 void ProxyConfiguration::setSslCertificateFileName(const QString &fileName)
 {
-    m_logFileName = fileName;
+    m_sslCertificateFileName = fileName;
 }
 
 QString ProxyConfiguration::sslCertificateKeyFileName() const
diff --git a/server/main.cpp b/server/main.cpp
index da79df0..ec2b935 100644
--- a/server/main.cpp
+++ b/server/main.cpp
@@ -13,6 +13,7 @@
 #include <QSslConfiguration>
 #include <QCommandLineParser>
 #include <QCommandLineOption>
+#include <QStandardPaths>
 
 #include <stdio.h>
 #include <unistd.h>
@@ -100,6 +101,8 @@ int main(int argc, char *argv[])
     s_loggingFilters.insert("Authentication", true);
     s_loggingFilters.insert("ProxyServer", true);
 
+    QString configFile = QStandardPaths::standardLocations(QStandardPaths::ConfigLocation).first() + "/nymea/nymea-remoteproxy.conf";
+
     // command line parser
     QCommandLineParser parser;
     parser.addHelpOption();
@@ -124,11 +127,11 @@ int main(int argc, char *argv[])
     QCommandLineOption mockAuthenticatorOption(QStringList() << "m" << "mock-authenticator", "Start the server using a mock authenticator which returns always true.");
     parser.addOption(mockAuthenticatorOption);
 
-    QCommandLineOption configOption(QStringList() << "c" <<"configuration", "The path to the proxy server configuration file. The default is /etc/nymea-remoteproxy/nymea-remoteproxy.conf", "configuration");
-    configOption.setDefaultValue("/etc/nymea-remoteproxy/nymea-remoteproxy.conf");
+    QCommandLineOption configOption(QStringList() << "c" <<"configuration", "The path to the proxy server configuration file. The default is " + configFile, "configuration");
+    configOption.setDefaultValue(configFile);
     parser.addOption(configOption);
 
-    QCommandLineOption verboseOption(QStringList() << "v" << "verbose", "Print more verbose.");
+    QCommandLineOption verboseOption(QStringList() << "verbose", "Print more verbose.");
     parser.addOption(verboseOption);
 
     parser.process(application);
@@ -136,11 +139,12 @@ int main(int argc, char *argv[])
     // Create a default configuration
     ProxyConfiguration *configuration = new ProxyConfiguration(nullptr);
     if (parser.isSet(configOption)) {
-        qCDebug(dcApplication()) << "Loading configuration file from" << parser.value(configOption);
-        if (!configuration->loadConfiguration(parser.value(configOption))) {
-            qCCritical(dcApplication()) << "Invalid configuration file passed" << parser.value(configOption);
-            exit(-1);
-        }
+        configFile = parser.value(configOption);
+    }
+    qCDebug(dcApplication()) << "Loading configuration file from" << configFile;
+    if (!configuration->loadConfiguration(parser.value(configOption))) {
+        qCCritical(dcApplication()) << "Invalid configuration file passed" << parser.value(configOption);
+        exit(-1);
     }