diff --git a/op/op.Settings.php b/op/op.Settings.php
index 3db54440a..ea9cb9d63 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -67,8 +67,8 @@ if ($action == "saveSettings")
 	}
 	function setBoolValue($name) {
 		global $_POST, $settings;
-		if(isset($_POST[$name]) && !in_array($name, $settings->_hiddenConfFields)) {
-			if ($_POST[$name]=="on")
+		if(!in_array($name, $settings->_hiddenConfFields)) {
+			if (isset($_POST[$name]) && $_POST[$name]=="on")
 				$settings->{"_".$name} = true;
 			else
 				$settings->{"_".$name} = false;
@@ -81,8 +81,8 @@ if ($action == "saveSettings")
 	}
 	function setArrayValue($name) {
 		global $_POST, $settings;
-		if(isset($_POST[$name]) && !in_array($name, $settings->_hiddenConfFields)) {
-			if($_POST[$name])
+		if(!in_array($name, $settings->_hiddenConfFields)) {
+			if(isset($_POST[$name]) && $_POST[$name])
 				$settings->{"_".$name} = $_POST[$name];
 			else
 				$settings->{"_".$name} = array();