diff --git a/AvocadoAmber/classes/setting/setting.class.php b/AvocadoAmber/classes/setting/setting.class.php
index f0f2ad2..2640bd9 100644
--- a/AvocadoAmber/classes/setting/setting.class.php
+++ b/AvocadoAmber/classes/setting/setting.class.php
@@ -623,9 +623,9 @@ class Setting
       $key1 = "cs_etc_{$idx}";
       $key2 = "cs_etc_{$idx2}";
       if (is_array($default) && isset($default[0]) && isset($default[1])) {
-        if ($this->$key1 === "" || !isset($this->$key1))
+        if (empty($this->$key1))
           $this->$key1 = array_key_exists($default[0], $options) ? $default[0] : "";
-        if ($this->$key2 === "" || !isset($this->$key2))
+        if (empty($this->$key2) && $this->$key2 !== 0)
           $this->$key2 = intval($default[1]);
       }
       $options_html = "";
@@ -665,14 +665,14 @@ class Setting
       $key3 = "cs_etc_{$idx3}";
 
       if (is_array($default) && isset($default[0]) && isset($default[1])) {
-        if ($this->$key1 === "" || !isset($this->$key1))
+        if (empty($this->$key1))
           $this->$key1 = array_key_exists($default[0], $options) ? $default[0] : "";
 
-        if ($this->$key2 === "" || !isset($this->$key2))
+        if (empty($this->$key2) && $this->$key2 !== 0)
           $this->$key2 = intval($default[1]);
       }
 
-      if (is_array($default) && isset($default[2])) {
+      if (empty($this->$key3) && $this->$key3 !== 0) {
         if ($this->$key3 === "" || !isset($this->$key3))
           $this->$key3 = intval($default[2]);
       }