diff --git a/YACReaderLibrary/server/lib/templateengine/templatecache.cpp b/YACReaderLibrary/server/lib/templateengine/templatecache.cpp
index 109074f1..538aaf22 100644
--- a/YACReaderLibrary/server/lib/templateengine/templatecache.cpp
+++ b/YACReaderLibrary/server/lib/templateengine/templatecache.cpp
@@ -6,7 +6,7 @@
 TemplateCache::TemplateCache(QSettings* settings, QObject* parent)
     :TemplateLoader(settings,parent)
 {
-    cache.setMaxCost(settings->value("cacheSize","160000").toInt());//este tamaņo antes era 1000000
+    cache.setMaxCost(settings->value("cacheSize","1000000").toInt());
     cacheTimeout=settings->value("cacheTime","60000").toInt();
     qDebug("TemplateCache: timeout=%i, size=%i",cacheTimeout,cache.maxCost());
 }
diff --git a/YACReaderLibrary/server/lib/templateengine/templateloader.cpp b/YACReaderLibrary/server/lib/templateengine/templateloader.cpp
index 2abcabd1..fbc52efa 100644
--- a/YACReaderLibrary/server/lib/templateengine/templateloader.cpp
+++ b/YACReaderLibrary/server/lib/templateengine/templateloader.cpp
@@ -9,12 +9,11 @@
 #include <QStringList>
 #include <QDir>
 #include <QSet>
-#include <QCoreApplication>
 
 TemplateLoader::TemplateLoader(QSettings* settings, QObject* parent)
     : QObject(parent)
 {
-    templatePath=settings->value("path","./server/templates").toString();
+    templatePath=settings->value("path",".").toString();
     // Convert relative path to absolute, based on the directory of the config file.
 #ifdef Q_OS_WIN32
     if (QDir::isRelativePath(templatePath) && settings->format()!=QSettings::NativeFormat)
@@ -22,13 +21,8 @@ TemplateLoader::TemplateLoader(QSettings* settings, QObject* parent)
     if (QDir::isRelativePath(templatePath))
 #endif
     {
-#if defined Q_OS_UNIX && !defined Q_OS_MAC
-        QFileInfo configFile(QString(DATADIR)+"/yacreader");
-        templatePath=QFileInfo(QString(DATADIR)+"/yacreader",templatePath).absoluteFilePath();
-#else
-        QFileInfo configFile(QCoreApplication::applicationDirPath());
-        templatePath=QFileInfo(QCoreApplication::applicationDirPath(),templatePath).absoluteFilePath();
-#endif
+        QFileInfo configFile(settings->fileName());
+        templatePath=QFileInfo(configFile.absolutePath(),templatePath).absoluteFilePath();
     }
     fileNameSuffix=settings->value("suffix",".tpl").toString();
     QString encoding=settings->value("encoding").toString();
diff --git a/YACReaderLibrary/server/startup.cpp b/YACReaderLibrary/server/startup.cpp
index 00f6901c..d6ce9fa8 100644
--- a/YACReaderLibrary/server/startup.cpp
+++ b/YACReaderLibrary/server/startup.cpp
@@ -54,6 +54,22 @@ void Startup::start() {
 	// Configure template loader and cache
 	QSettings* templateSettings=new QSettings(configFileName,QSettings::IniFormat,app);
 	templateSettings->beginGroup("templates");
+
+    if(templateSettings->value("cacheSize").isNull())
+        templateSettings->setValue("cacheSize","160000");
+
+    QString baseTemplatePath = QString("./server/templates");
+    QString templatePath;
+
+    #if defined Q_OS_UNIX && !defined Q_OS_MAC
+            templatePath=QFileInfo(QString(DATADIR)+"/yacreader",baseTemplatePath).absoluteFilePath();
+    #else
+            templatePath=QFileInfo(QCoreApplication::applicationDirPath(),baseTemplatePath).absoluteFilePath();
+    #endif
+
+    if(templateSettings->value("path").isNull())
+        templateSettings->setValue("path",templatePath);
+
 	Static::templateLoader=new TemplateCache(templateSettings,app);
 
 	// Configure session store