diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 0f4e62c52d..b7487a2b4c 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -79,13 +79,7 @@ DomainServer::DomainServer(int argc, char* argv[]) :
 
     connect(this, &QCoreApplication::aboutToQuit, this, &DomainServer::aboutToQuit);
 
-    setApplicationName(BuildInfo::DOMAIN_SERVER_NAME);
-    setOrganizationName(BuildInfo::MODIFIED_ORGANIZATION);
-    setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
-    setApplicationVersion(BuildInfo::VERSION);
-
     qDebug() << "Setting up domain-server";
-
     qDebug() << "[VERSION] Build sequence:" << qPrintable(applicationVersion());
     qDebug() << "[VERSION] MODIFIED_ORGANIZATION:" << BuildInfo::MODIFIED_ORGANIZATION;
     qDebug() << "[VERSION] VERSION:" << BuildInfo::VERSION;
diff --git a/domain-server/src/main.cpp b/domain-server/src/main.cpp
index b3b5c8b9be..94d05fff90 100644
--- a/domain-server/src/main.cpp
+++ b/domain-server/src/main.cpp
@@ -19,12 +19,18 @@
 
 #include <LogHandler.h>
 #include <SharedUtil.h>
+#include <BuildInfo.h>
 
 #include "DomainServer.h"
 
 int main(int argc, char* argv[]) {
     disableQtBearerPoll(); // Fixes wifi ping spikes
 
+    QCoreApplication::setApplicationName(BuildInfo::DOMAIN_SERVER_NAME);
+    QCoreApplication::setOrganizationName(BuildInfo::MODIFIED_ORGANIZATION);
+    QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
+    QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
+
 #ifndef WIN32
     setvbuf(stdout, NULL, _IOLBF, 0);
 #endif
diff --git a/libraries/shared/src/SettingInterface.cpp b/libraries/shared/src/SettingInterface.cpp
index dd2b2fc595..01b9f3884f 100644
--- a/libraries/shared/src/SettingInterface.cpp
+++ b/libraries/shared/src/SettingInterface.cpp
@@ -45,6 +45,7 @@ namespace Setting {
         // Set settings format
         QSettings::setDefaultFormat(JSON_FORMAT);
         QSettings settings;
+        qCDebug(shared) << "Settings file:" << settings.fileName();
 
         if (settings.allKeys().isEmpty()) {
             loadOldINIFile(settings);