diff --git a/SoObjects/SOGo/SOGoUserDefaults.m b/SoObjects/SOGo/SOGoUserDefaults.m
index a0a7828cb..e91676d9b 100644
--- a/SoObjects/SOGo/SOGoUserDefaults.m
+++ b/SoObjects/SOGo/SOGoUserDefaults.m
@@ -543,7 +543,7 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
 {
   NSString *s;
 
-  if ([newValue intValue] == 0)
+  if ([newValue intValue] <= 0)
     s = @"5";
   else
     s = newValue;
@@ -557,7 +557,7 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
 
   s = [self stringForKey: @"SOGoMailAutoSave"];
 
-  if ([s intValue] == 0)
+  if ([s intValue] <= 0)
     s = @"5";
 
   return s;
diff --git a/UI/WebServerResources/UIxMailEditor.js b/UI/WebServerResources/UIxMailEditor.js
index ca350275e..4773427c1 100644
--- a/UI/WebServerResources/UIxMailEditor.js
+++ b/UI/WebServerResources/UIxMailEditor.js
@@ -384,7 +384,7 @@ function initAddresses() {
 }
 
 function initAutoSaveTimer() {
-    var autoSave = parseInt(UserDefaults["SOGoMailAutoSave"]) || 5;
+    var autoSave = Math.abs(parseInt(UserDefaults["SOGoMailAutoSave"])) || 5;
 
     if (autoSave) {
         var interval;