diff --git a/doc/html/.gitignore b/doc/html/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..55df230c171b568eca02fa65cf6821034d1e26aa
--- /dev/null
+++ b/doc/html/.gitignore
@@ -0,0 +1,2 @@
+*html
+*index*
diff --git a/src/main.cpp b/src/main.cpp
index bca8c5fbbf956281ccceeabe5b08533e5e4b5681..b4d47b2b6205bf5a507c2f8d9303106e5052d605 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -33,8 +33,6 @@
 int main(int argc, char *argv[])
 {
     QCoreApplication app(argc, argv);
-    QCoreApplication::setOrganizationName("nemomobile");
-    QCoreApplication::setApplicationName("nemo-transfer-engine");
 
     QString translationPath("/usr/share/translations/");
     QTranslator engineeringEnglish;
diff --git a/src/transferengine.cpp b/src/transferengine.cpp
index 8af11c3262878095f2359f3b74aebe36a81bf777..d29bf5e72c8870c132f4b23d5245ea2eb5b5b02c 100644
--- a/src/transferengine.cpp
+++ b/src/transferengine.cpp
@@ -46,6 +46,7 @@
 #include <signal.h>
 
 #define SHARE_PLUGINS_PATH "/usr/lib/nemo-transferengine/plugins"
+#define CONFIG_PATH "/usr/share/nemo-transferengine/nemo-transfer-engine.conf"
 #define FILE_WATCHER_TIMEOUT 5000
 
 
@@ -74,6 +75,7 @@ TransferEngineSignalHandler::TransferEngineSignalHandler()
 
 TransferEnginePrivate::TransferEnginePrivate(TransferEngine *parent):
     m_notificationsEnabled(true),
+    m_settings(CONFIG_PATH, QSettings::IniFormat),
     q_ptr(parent)
 {
     m_fileWatcherTimer = new QTimer(this);