diff --git a/src/main/java/de/deadlocker8/budgetmaster/ProgramArgs.java b/src/main/java/de/deadlocker8/budgetmaster/ProgramArgs.java
index b15699d79a8c9e9aebc8505fd2eed3fa545f479f..f361954093d9760beff66e079add27b0c78e1af7 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/ProgramArgs.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/ProgramArgs.java
@@ -60,9 +60,4 @@ public class ProgramArgs
 	{
 		return RunMode.currentRunMode.equals(RunMode.TEST);
 	}
-
-	public static boolean isUseSimpleDatepickerForTransactions()
-	{
-		return ProgramArgs.getArgs().contains("--useSimpleDatepicker");
-	}
 }
\ No newline at end of file
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java b/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
index 50bf4d93b8b45af4ec9d9588621389b1dd9f9db7..3cdd039487bd3089769c1570b58be1def6f0446e 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
@@ -22,6 +22,7 @@ import de.deadlocker8.budgetmaster.utils.LanguageType;
 import de.thecodelabs.utils.util.ColorUtilsNonJavaFX;
 import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -49,6 +50,9 @@ public class HelpersService
 	@Autowired
 	private CategoryRepository categoryRepository;
 
+	@Value("${use.simple.datepicker:false}")
+	private boolean useSimpleDatepickerForTransactions;
+
 	public List<LanguageType> getAvailableLanguages()
 	{
 		return Arrays.asList(LanguageType.values());
@@ -195,4 +199,9 @@ public class HelpersService
 	{
 		return transactionService.getRepository().countByCategory(category);
 	}
+
+	public boolean isUseSimpleDatepickerForTransactions()
+	{
+		return useSimpleDatepickerForTransactions;
+	}
 }
\ No newline at end of file
diff --git a/src/main/resources/templates/transactions/newTransactionMacros.ftl b/src/main/resources/templates/transactions/newTransactionMacros.ftl
index 1f2e7efac5095a3d2f895a6208c988052472dc93..16fd544584a228d1f3b1e312ebaf042c4979a2ca 100644
--- a/src/main/resources/templates/transactions/newTransactionMacros.ftl
+++ b/src/main/resources/templates/transactions/newTransactionMacros.ftl
@@ -137,7 +137,7 @@
                 <#assign startDate = dateService.getLongDateString(currentDate)/>
             </#if>
 
-            <input id="transaction-datepicker" type="text" class="datepicker<#if programArgs.isUseSimpleDatepickerForTransactions()>-simple</#if>" name="date" value="${startDate}">
+            <input id="transaction-datepicker" type="text" class="datepicker<#if helpers.isUseSimpleDatepickerForTransactions()>-simple</#if>" name="date" value="${startDate}">
             <label class="input-label" for="transaction-datepicker">${locale.getString("transaction.new.label.date")}</label>
         </div>
     </div>
@@ -330,7 +330,7 @@
                     <td class="cell">${locale.getString("repeating.end.date")}</td>
                     <td class="cell input-cell">
                         <div class="input-field no-margin">
-                            <input class="datepicker<#if programArgs.isUseSimpleDatepickerForTransactions()>-simple</#if> no-margin input-min-width" id="transaction-repeating-end-date-input" type="text" value="${endDate}">
+                            <input class="datepicker<#if helpers.isUseSimpleDatepickerForTransactions()>-simple</#if> no-margin input-min-width" id="transaction-repeating-end-date-input" type="text" value="${endDate}">
                             <label for="transaction-repeating-end-date-input"></label>
                         </div>
                     </td>