diff --git a/src/pd/c_invoice_bt_agency_to_cc.cpp b/src/pd/c_invoice_bt_agency_to_cc.cpp
index 4ec7239..58c2489 100644
--- a/src/pd/c_invoice_bt_agency_to_cc.cpp
+++ b/src/pd/c_invoice_bt_agency_to_cc.cpp
@@ -97,7 +97,7 @@ auto C_Invoice_BT_Agency_To_CC::GenerateDocumentArchive() -> string
 			bt_printer.SetBT(bt);
 			bt_printer.SetVariableSet(&invoicing_vars);
 
-			bt_printer.xlSetKey(config->GetFromFile("secret", "XL_USERNAME"), config->GetFromFile("secret", "XL_KEY"));
+			bt_printer.xlSetKey(config->GetFromFile(SECRET_FILE, "XL_USERNAME"), config->GetFromFile(SECRET_FILE, "XL_KEY"));
 			bt_printer.SetFilename(filename_xls);
 			error_message = bt_printer.PrintAsXLS();
 			if(error_message.length())
@@ -165,7 +165,7 @@ auto C_Invoice_BT_Agency_To_CC::GenerateDocumentArchive() -> string
 
 			if(error_message.empty()) 
 			{
-				invoice_printer->xlSetKey(config->GetFromFile("secret", "XL_USERNAME"), config->GetFromFile("secret", "XL_KEY"));
+				invoice_printer->xlSetKey(config->GetFromFile(SECRET_FILE, "XL_USERNAME"), config->GetFromFile(SECRET_FILE, "XL_KEY"));
 				invoice_printer->SetFilename(invoice_filename_xls);
 				error_message = invoice_printer->PrintAsXLS();
 				if(error_message.empty()) {}
@@ -199,7 +199,7 @@ auto C_Invoice_BT_Agency_To_CC::GenerateDocumentArchive() -> string
 
 			if(error_message.empty()) 
 			{
-				act_printer->xlSetKey(config->GetFromFile("secret", "XL_USERNAME"), config->GetFromFile("secret", "XL_KEY"));
+				act_printer->xlSetKey(config->GetFromFile(SECRET_FILE, "XL_USERNAME"), config->GetFromFile(SECRET_FILE, "XL_KEY"));
 				act_printer->SetFilename(act_filename_xls);
 				error_message = act_printer->PrintAsXLS();
 				if(error_message.empty()) {}
@@ -233,7 +233,7 @@ auto C_Invoice_BT_Agency_To_CC::GenerateDocumentArchive() -> string
 
 			if(error_message.empty()) 
 			{
-				vat_printer->xlSetKey(config->GetFromFile("secret", "XL_USERNAME"), config->GetFromFile("secret", "XL_KEY"));
+				vat_printer->xlSetKey(config->GetFromFile(SECRET_FILE, "XL_USERNAME"), config->GetFromFile(SECRET_FILE, "XL_KEY"));
 				vat_printer->SetFilename(vat_filename_xls);
 				error_message = vat_printer->PrintAsXLS();
 				if(error_message.empty()) {}
diff --git a/src/pd/c_invoice_bt_subc_to_agency.cpp b/src/pd/c_invoice_bt_subc_to_agency.cpp
index 5d69519..fade451 100644
--- a/src/pd/c_invoice_bt_subc_to_agency.cpp
+++ b/src/pd/c_invoice_bt_subc_to_agency.cpp
@@ -77,7 +77,7 @@ auto C_Invoice_BT_Subc_To_Agency::GenerateDocumentArchive() -> string
 			bt_printer.SetBT(bt);
 			bt_printer.SetVariableSet(&invoicing_vars);
 
-			bt_printer.xlSetKey(config->GetFromFile("secret", "XL_USERNAME"), config->GetFromFile("secret", "XL_KEY"));
+			bt_printer.xlSetKey(config->GetFromFile(SECRET_FILE, "XL_USERNAME"), config->GetFromFile(SECRET_FILE, "XL_KEY"));
 			bt_printer.SetFilename(filename_xls);
 			error_message = bt_printer.PrintAsXLS();
 			if(error_message.length())
@@ -137,7 +137,7 @@ auto C_Invoice_BT_Subc_To_Agency::GenerateDocumentArchive() -> string
 
 			if(error_message.empty()) 
 			{
-				invoice_printer->xlSetKey(config->GetFromFile("secret", "XL_USERNAME"), config->GetFromFile("secret", "XL_KEY"));
+				invoice_printer->xlSetKey(config->GetFromFile(SECRET_FILE, "XL_USERNAME"), config->GetFromFile(SECRET_FILE, "XL_KEY"));
 				invoice_printer->SetFilename(invoice_filename_xls);
 				error_message = invoice_printer->PrintAsXLS();
 				if(error_message.empty()) {}
@@ -173,7 +173,7 @@ auto C_Invoice_BT_Subc_To_Agency::GenerateDocumentArchive() -> string
 
 			if(error_message.empty()) 
 			{
-				act_printer->xlSetKey(config->GetFromFile("secret", "XL_USERNAME"), config->GetFromFile("secret", "XL_KEY"));
+				act_printer->xlSetKey(config->GetFromFile(SECRET_FILE, "XL_USERNAME"), config->GetFromFile(SECRET_FILE, "XL_KEY"));
 				act_printer->SetFilename(act_filename_xls);
 				error_message = act_printer->PrintAsXLS();
 				if(error_message.empty()) {}
@@ -210,7 +210,7 @@ auto C_Invoice_BT_Subc_To_Agency::GenerateDocumentArchive() -> string
 
 				if(error_message.empty()) 
 				{
-					vat_printer->xlSetKey(config->GetFromFile("secret", "XL_USERNAME"), config->GetFromFile("secret", "XL_KEY"));
+					vat_printer->xlSetKey(config->GetFromFile(SECRET_FILE, "XL_USERNAME"), config->GetFromFile(SECRET_FILE, "XL_KEY"));
 					vat_printer->SetFilename(vat_filename_xls);
 					error_message = vat_printer->PrintAsXLS();
 					if(error_message.empty()) {}
diff --git a/src/pd/c_invoice_service_agency_to_cc.cpp b/src/pd/c_invoice_service_agency_to_cc.cpp
index 2577928..c490692 100644
--- a/src/pd/c_invoice_service_agency_to_cc.cpp
+++ b/src/pd/c_invoice_service_agency_to_cc.cpp
@@ -167,7 +167,7 @@ auto C_Invoice_Service_Agency_To_CC::GenerateDocumentArchive() -> string
 			timecard_printer.SetVariableSet(&invoicing_vars);
 			timecard_printer.SetHolidays(GetHolidaysSet(GetSpellingFormattedDate(timecard.GetDateStart(), "%F"), db));
 
-			timecard_printer.xlSetKey(config->GetFromFile("secret", "XL_USERNAME"), config->GetFromFile("secret", "XL_KEY"));
+			timecard_printer.xlSetKey(config->GetFromFile(SECRET_FILE, "XL_USERNAME"), config->GetFromFile(SECRET_FILE, "XL_KEY"));
 			timecard_printer.SetFilename(filename_xls);
 			error_message = timecard_printer.PrintAsXLS();
 			if(error_message.length())
@@ -237,7 +237,7 @@ auto C_Invoice_Service_Agency_To_CC::GenerateDocumentArchive() -> string
 
 			if(error_message.empty()) 
 			{
-				invoice_printer->xlSetKey(config->GetFromFile("secret", "XL_USERNAME"), config->GetFromFile("secret", "XL_KEY"));
+				invoice_printer->xlSetKey(config->GetFromFile(SECRET_FILE, "XL_USERNAME"), config->GetFromFile(SECRET_FILE, "XL_KEY"));
 				invoice_printer->SetFilename(invoice_filename_xls);
 				error_message = invoice_printer->PrintAsXLS();
 				if(error_message.empty()) {}
@@ -271,7 +271,7 @@ auto C_Invoice_Service_Agency_To_CC::GenerateDocumentArchive() -> string
 
 			if(error_message.empty()) 
 			{
-				act_printer->xlSetKey(config->GetFromFile("secret", "XL_USERNAME"), config->GetFromFile("secret", "XL_KEY"));
+				act_printer->xlSetKey(config->GetFromFile(SECRET_FILE, "XL_USERNAME"), config->GetFromFile(SECRET_FILE, "XL_KEY"));
 				act_printer->SetFilename(act_filename_xls);
 				error_message = act_printer->PrintAsXLS();
 				if(error_message.empty()) {}
@@ -305,7 +305,7 @@ auto C_Invoice_Service_Agency_To_CC::GenerateDocumentArchive() -> string
 
 			if(error_message.empty()) 
 			{
-				vat_printer->xlSetKey(config->GetFromFile("secret", "XL_USERNAME"), config->GetFromFile("secret", "XL_KEY"));
+				vat_printer->xlSetKey(config->GetFromFile(SECRET_FILE, "XL_USERNAME"), config->GetFromFile(SECRET_FILE, "XL_KEY"));
 				vat_printer->SetFilename(vat_filename_xls);
 				error_message = vat_printer->PrintAsXLS();
 				if(error_message.empty()) {}
diff --git a/src/pd/c_invoice_service_subc_to_agency.cpp b/src/pd/c_invoice_service_subc_to_agency.cpp
index 94c9c77..61cfc28 100644
--- a/src/pd/c_invoice_service_subc_to_agency.cpp
+++ b/src/pd/c_invoice_service_subc_to_agency.cpp
@@ -128,7 +128,7 @@ auto C_Invoice_Service_Subc_To_Agency::GenerateDocumentArchive() -> string
 			timecard_printer.SetVariableSet(&invoicing_vars);
 			timecard_printer.SetHolidays(GetHolidaysSet(GetSpellingFormattedDate(timecard.GetDateStart(), "%F"), db));
 
-			timecard_printer.xlSetKey(config->GetFromFile("secret", "XL_USERNAME"), config->GetFromFile("secret", "XL_KEY"));
+			timecard_printer.xlSetKey(config->GetFromFile(SECRET_FILE, "XL_USERNAME"), config->GetFromFile(SECRET_FILE, "XL_KEY"));
 			timecard_printer.SetFilename(filename_xls);
 			error_message = timecard_printer.PrintAsXLS();
 			if(error_message.length())
@@ -191,7 +191,7 @@ auto C_Invoice_Service_Subc_To_Agency::GenerateDocumentArchive() -> string
 
 			if(error_message.empty()) 
 			{
-				invoice_printer->xlSetKey(config->GetFromFile("secret", "XL_USERNAME"), config->GetFromFile("secret", "XL_KEY"));
+				invoice_printer->xlSetKey(config->GetFromFile(SECRET_FILE, "XL_USERNAME"), config->GetFromFile(SECRET_FILE, "XL_KEY"));
 				invoice_printer->SetFilename(invoice_filename_xls);
 				error_message = invoice_printer->PrintAsXLS();
 				if(error_message.empty()) {}
@@ -226,7 +226,7 @@ auto C_Invoice_Service_Subc_To_Agency::GenerateDocumentArchive() -> string
 
 			if(error_message.empty()) 
 			{
-				act_printer->xlSetKey(config->GetFromFile("secret", "XL_USERNAME"), config->GetFromFile("secret", "XL_KEY"));
+				act_printer->xlSetKey(config->GetFromFile(SECRET_FILE, "XL_USERNAME"), config->GetFromFile(SECRET_FILE, "XL_KEY"));
 				act_printer->SetFilename(act_filename_xls);
 				error_message = act_printer->PrintAsXLS();
 				if(error_message.empty()) {}
@@ -264,7 +264,7 @@ auto C_Invoice_Service_Subc_To_Agency::GenerateDocumentArchive() -> string
 
 				if(error_message.empty()) 
 				{
-					vat_printer->xlSetKey(config->GetFromFile("secret", "XL_USERNAME"), config->GetFromFile("secret", "XL_KEY"));
+					vat_printer->xlSetKey(config->GetFromFile(SECRET_FILE, "XL_USERNAME"), config->GetFromFile(SECRET_FILE, "XL_KEY"));
 					vat_printer->SetFilename(vat_filename_xls);
 					error_message = vat_printer->PrintAsXLS();
 					if(error_message.empty()) {}