diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 290f4a7f53..22273ae85f 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -157,7 +157,6 @@ DomainServer::DomainServer(int argc, char* argv[]) :
     DependencyManager::set<StatTracker>();
 
     LogUtils::init();
-    Setting::init();
 
     qDebug() << "Setting up domain-server";
     qDebug() << "[VERSION] Build sequence:" << qPrintable(applicationVersion());
diff --git a/domain-server/src/main.cpp b/domain-server/src/main.cpp
index 725a04ec46..dc3ee54fe7 100644
--- a/domain-server/src/main.cpp
+++ b/domain-server/src/main.cpp
@@ -29,6 +29,8 @@ int main(int argc, char* argv[]) {
     QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
     QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
 
+    Setting::init();
+
 #ifndef WIN32
     setvbuf(stdout, NULL, _IOLBF, 0);
 #endif
diff --git a/tests/qt59/src/main.cpp b/tests/qt59/src/main.cpp
index c66a5e6f9a..7b95cabd6c 100644
--- a/tests/qt59/src/main.cpp
+++ b/tests/qt59/src/main.cpp
@@ -33,8 +33,6 @@ private:
 Qt59TestApp::Qt59TestApp(int argc, char* argv[]) :
     QCoreApplication(argc, argv)
 {
-
-    Setting::init();
     DependencyManager::registerInheritance<LimitedNodeList, NodeList>();
     DependencyManager::set<AccountManager>([&] { return QString("Mozilla/5.0 (HighFidelityACClient)"); });
     DependencyManager::set<AddressManager>();
diff --git a/tools/ac-client/src/ACClientApp.cpp b/tools/ac-client/src/ACClientApp.cpp
index 88884a4fee..9eadc1dec2 100644
--- a/tools/ac-client/src/ACClientApp.cpp
+++ b/tools/ac-client/src/ACClientApp.cpp
@@ -97,7 +97,6 @@ ACClientApp::ACClientApp(int argc, char* argv[]) :
         _password = pieces[1];
     }
 
-    Setting::init();
     DependencyManager::registerInheritance<LimitedNodeList, NodeList>();
 
     DependencyManager::set<AccountManager>([&]{ return QString("Mozilla/5.0 (HighFidelityACClient)"); });
diff --git a/tools/ac-client/src/main.cpp b/tools/ac-client/src/main.cpp
index 12c5e6f5f8..c9affde3b5 100644
--- a/tools/ac-client/src/main.cpp
+++ b/tools/ac-client/src/main.cpp
@@ -25,6 +25,8 @@ int main(int argc, char * argv[]) {
     QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
     QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
 
+    Setting::init();
+
     ACClientApp app(argc, argv);
 
     return app.exec();
diff --git a/tools/atp-client/src/ATPClientApp.cpp b/tools/atp-client/src/ATPClientApp.cpp
index 9fd1bf8d4f..0e7f223f28 100644
--- a/tools/atp-client/src/ATPClientApp.cpp
+++ b/tools/atp-client/src/ATPClientApp.cpp
@@ -135,7 +135,6 @@ ATPClientApp::ATPClientApp(int argc, char* argv[]) :
         _domainServerAddress = domainURL.toString();
     }
 
-    Setting::init();
     DependencyManager::registerInheritance<LimitedNodeList, NodeList>();
 
     DependencyManager::set<StatTracker>();
diff --git a/tools/atp-client/src/main.cpp b/tools/atp-client/src/main.cpp
index 88119604cf..830c049bc7 100644
--- a/tools/atp-client/src/main.cpp
+++ b/tools/atp-client/src/main.cpp
@@ -25,6 +25,8 @@ int main(int argc, char * argv[]) {
     QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
     QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
 
+    Setting::init();
+
     ATPClientApp app(argc, argv);
 
     return app.exec();
diff --git a/tools/oven/src/Oven.cpp b/tools/oven/src/Oven.cpp
index 9de06a35bb..69d2ef84ce 100644
--- a/tools/oven/src/Oven.cpp
+++ b/tools/oven/src/Oven.cpp
@@ -14,7 +14,6 @@
 #include <QtCore/QCommandLineParser>
 
 #include <image/Image.h>
-#include <SettingInterface.h>
 
 #include "ui/OvenMainWindow.h"
 #include "Oven.h"
@@ -29,12 +28,6 @@ static const QString CLI_TYPE_PARAMETER = "t";
 Oven::Oven(int argc, char* argv[]) :
     QApplication(argc, argv)
 {
-    QCoreApplication::setOrganizationName("High Fidelity");
-    QCoreApplication::setApplicationName("Oven");
-
-    // init the settings interface so we can save and load settings
-    Setting::init();
-
     // parse the command line parameters
     QCommandLineParser parser;
    
diff --git a/tools/oven/src/main.cpp b/tools/oven/src/main.cpp
index 9c778245b5..788470b75e 100644
--- a/tools/oven/src/main.cpp
+++ b/tools/oven/src/main.cpp
@@ -10,7 +10,15 @@
 
 #include "Oven.h"
 
+#include <SettingInterface.h>
+
 int main (int argc, char** argv) {
+    QCoreApplication::setOrganizationName("High Fidelity");
+    QCoreApplication::setApplicationName("Oven");
+
+    // init the settings interface so we can save and load settings
+    Setting::init();
+
     Oven app(argc, argv);
     return app.exec();
 }