diff --git a/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java
index d68bf5af02e041b3968ff6d8052f750fa5299066..4d19aff8b34ea56403ef51bb13465ab375e3667c 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java
@@ -93,10 +93,17 @@ public class SettingsController extends BaseController
 					   @RequestParam(value = "password") String password,
 					   @RequestParam(value = "passwordConfirmation") String passwordConfirmation,
 					   @RequestParam(value = "languageType") String languageType,
-					   @RequestParam(value = "autoBackupStrategyType") String autoBackupStrategyType)
+					   @RequestParam(value = "autoBackupStrategyType", required = false) String autoBackupStrategyType)
 	{
 		settings.setLanguage(LanguageType.fromName(languageType));
-		settings.setAutoBackupStrategy(AutoBackupStrategy.fromName(autoBackupStrategyType));
+		if(autoBackupStrategyType == null)
+		{
+			settings.setAutoBackupStrategy(AutoBackupStrategy.NONE);
+		}
+		else
+		{
+			settings.setAutoBackupStrategy(AutoBackupStrategy.fromName(autoBackupStrategyType));
+		}
 
 		Optional<FieldError> passwordErrorOptional = settingsService.validatePassword(password, passwordConfirmation);
 		if(passwordErrorOptional.isPresent())
diff --git a/src/main/resources/static/js/settings.js b/src/main/resources/static/js/settings.js
index 43b38df0a0481a3bca06bf5347958b9f5f4d0156..31b8e205a14b59e7b9a7ff15873ff8ffe80e4211 100644
--- a/src/main/resources/static/js/settings.js
+++ b/src/main/resources/static/js/settings.js
@@ -86,6 +86,10 @@ function validateForm()
         let autoBackupFilesToKeepValid = validateNumber($('#settings-backup-auto-files-to-keep').val(), "settings-backup-auto-files-to-keep", "hidden-settings-backup-auto-files-to-keep", numberValidationMessageZeroAllowed, REGEX_NUMBER);
         return autoBackupDaysValid && autoBackupFilesToKeepValid;
     }
+    else
+    {
+        document.getElementById('settings-backup-auto-strategy').name = '';
+    }
 
     return true;
 }