diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
index 1465be91ea26c78154d8cd50b169bd7c0fa732d9..c8f919d1feaeddd63d189daa3b0e01653c736f97 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
@@ -46,11 +46,6 @@ import static java.time.temporal.TemporalAdjusters.lastDayOfMonth;
 @RequestMapping(Mappings.TRANSACTIONS)
 public class TransactionController extends BaseController
 {
-	private static class ModelAttributes
-	{
-		public static final String KEYWORD = "keyword";
-	}
-
 	private static class ReturnValues
 	{
 		public static final String ALL_ENTITIES = "transactions/transactions";
@@ -62,7 +57,6 @@ public class TransactionController extends BaseController
 		public static final String REDIRECT_NEW_TRANSACTION = "redirect:/transactions/newTransaction/normal";
 		public static final String NEW_TRANSACTION = "transactions/newTransactionNormal";
 		public static final String CHANGE_TYPE = "transactions/changeTypeModal";
-		public static final String KEYWORD_WARNING = "transactions/transactionNameKeywordWarningModal";
 	}
 
 	private static final String CONTINUE = "continue";
diff --git a/BudgetMasterServer/src/main/resources/static/js/transactions.js b/BudgetMasterServer/src/main/resources/static/js/transactions.js
index cfdcc2c4e4c277cf986e02934241d5ed2444e13e..9954335030c8e0993c52de1cbcc145dd4e5c8c3d 100644
--- a/BudgetMasterServer/src/main/resources/static/js/transactions.js
+++ b/BudgetMasterServer/src/main/resources/static/js/transactions.js
@@ -385,7 +385,8 @@ function convertDateWithoutDots(dateString)
 function validateForm(isSaveAndContinue = false, allowEmptyAmount = false, skipKeywordCheck = false)
 {
     // name (keyword check)
-    let isExpenditure = document.getElementById('input-isPayment').value === "1";
+    let isExpenditureSwitch = document.getElementById('input-isPayment');
+    let isExpenditure = isExpenditureSwitch !== null && isExpenditureSwitch.value === "1";
     if(!skipKeywordCheck && isExpenditure)
     {
         let nameContainsKeywords = checkNameForKeywords(isSaveAndContinue);
diff --git a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/settings/BackupSettingsTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/settings/BackupSettingsTest.java
index a8d58060bcfee25660fcb8f8d57f5cf2aa4477a1..bcb5ffc160f92f386b599dc95ef2fcb88a0c3344 100644
--- a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/settings/BackupSettingsTest.java
+++ b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/settings/BackupSettingsTest.java
@@ -90,11 +90,7 @@ class BackupSettingsTest extends SeleniumTestBase
 		driver.findElements(By.cssSelector("#backupSettingsContainer button")).get(1).click();
 
 		wait = new WebDriverWait(driver, Duration.ofSeconds(5));
-		wait.until(ExpectedConditions.visibilityOfElementLocated(By.className("toast")));
-
-		// assert
-		assertThat(driver.findElement(By.className("toast")).getText())
-				.contains("Error saving settings");
+		wait.until(ExpectedConditions.attributeContains(By.id("settings-backup-auto-days"), "data-tooltip", "greater than 0"));
 
 		assertThat(driver.findElement(By.cssSelector("#backupSettingsContainerHeader .collapsible-header-button")).isDisplayed())
 				.isTrue();