diff --git a/workflow/engine/classes/class.configuration.php b/workflow/engine/classes/class.configuration.php
index 5ec6c2346..917c260ba 100755
--- a/workflow/engine/classes/class.configuration.php
+++ b/workflow/engine/classes/class.configuration.php
@@ -374,7 +374,7 @@ class Configurations // extends Configuration
     public function getFormats()
     {
     	$this->UserConfig = array();
-        if (!isset($this->UserConfig)) {
+        if (empty($this->UserConfig)) {
             $this->UserConfig = $this->getConfiguration("ENVIRONMENT_SETTINGS", "");
         }
 
diff --git a/workflow/engine/methods/setup/environmentSettingsAjax.php b/workflow/engine/methods/setup/environmentSettingsAjax.php
index e03a107b0..d888d6159 100755
--- a/workflow/engine/methods/setup/environmentSettingsAjax.php
+++ b/workflow/engine/methods/setup/environmentSettingsAjax.php
@@ -5,7 +5,6 @@
  * @date Sept 13th, 2010
  *
  */
-
 G::LoadClass( "configuration" );
 
 $request = isset( $_POST["request"] ) ? $_POST["request"] : (isset( $_GET["request"] ) ? $_GET["request"] : null);
@@ -36,17 +35,32 @@ switch ($request) {
     case "save":
         $conf = new Configurations();
         $config = $conf->getConfiguration("ENVIRONMENT_SETTINGS", "" );
-        $config['format'] = $_POST["userFormat"];
-        $config['dateFormat'] = $_POST["dateFormat"];
+        //$config['format'] = $_POST["userFormat"];
+        if (isset($_POST["userFormat"])) {
+            $config['format'] = $_POST["userFormat"]; 
+        }        
+        //$config['dateFormat'] = $_POST["dateFormat"];
+        if (isset($_POST["dateFormat"])) {
+            $config['dateFormat'] = $_POST["dateFormat"]; 
+        }
         $config['startCaseHideProcessInf'] = ((isset( $_POST["hideProcessInf"] )) ? true : false);
-        $config['casesListDateFormat'] = $_POST["casesListDateFormat"];
-        $config['casesListRowNumber'] = intval( $_POST["casesListRowNumber"] );
-        $config['casesListRefreshTime'] = intval( $_POST["txtCasesRefreshTime"]);
+        //$config['casesListDateFormat'] = $_POST["casesListDateFormat"];
+        if (isset($_POST["casesListDateFormat"])) {
+            $config['casesListDateFormat'] = $_POST["casesListDateFormat"]; 
+        }        
+        //$config['casesListRowNumber'] = intval( $_POST["casesListRowNumber"] );
+        if (isset($_POST["casesListDateFormat"])) {
+            $config['casesListRowNumber'] = intval( $_POST["casesListRowNumber"] );
+        }
+        //$config['casesListRefreshTime'] = intval( $_POST["txtCasesRefreshTime"]);
+        if (isset($_POST["txtCasesRefreshTime"])) {
+            $config['casesListRefreshTime'] = intval( $_POST["txtCasesRefreshTime"]);
+        }
 
         $conf->aConfig = $config;
         $conf->saveConfig( "ENVIRONMENT_SETTINGS", "" );
 
-        G::auditLog("UpdateEnvironmentSettings", "UserNameDisplayFormat -> ".$_POST["userFormat"].", GlobalDateFormat -> ".$_POST["dateFormat"].", HideProcessInformation -> ".(string)isset($_POST["hideProcessInf"]).", DateFormat -> ".$_POST["casesListDateFormat"].", NumberOfRowsPerPage -> ".$_POST["casesListRowNumber"].", RefreshTimeSeconds -> ".$_POST["txtCasesRefreshTime"]);
+        G::auditLog("UpdateEnvironmentSettings", "UserNameDisplayFormat -> ".isset($_POST["userFormat"]).", GlobalDateFormat -> ".isset($_POST["dateFormat"]).", HideProcessInformation -> ".(string)isset($_POST["hideProcessInf"]).", DateFormat -> ".isset($_POST["casesListDateFormat"]).", NumberOfRowsPerPage -> ".isset($_POST["casesListRowNumber"]).", RefreshTimeSeconds -> ".isset($_POST["txtCasesRefreshTime"]));
 
         $response = new stdclass();
         $response->success = true;