diff --git a/workflow/engine/methods/dynaforms/fields_Edit.php b/workflow/engine/methods/dynaforms/fields_Edit.php
index 0e35c54ae..e4b7e2f85 100644
--- a/workflow/engine/methods/dynaforms/fields_Edit.php
+++ b/workflow/engine/methods/dynaforms/fields_Edit.php
@@ -138,7 +138,7 @@ if (($RBAC_Response=$RBAC->userCanAccess("PM_FACTORY"))!=1) return $RBAC_Respons
     if (isset($form->fields[$fields->Fields['XMLNODE_NAME']]->code)) $Fields['PME_CODE'] = $form->fields[$fields->Fields['XMLNODE_NAME']]->code;
     $options=isset($form->fields[$fields->Fields['XMLNODE_NAME']]->option)?
       $form->fields[$fields->Fields['XMLNODE_NAME']]->option:array();
-    if (!is_array($options)) $options =array();
+    if (!is_array($options) || count($options)==0) $options =array('' => '');
     $Fields['PME_OPTIONS'] = array(
       'NAME' => array_keys($options),
       'LABEL' => array_values($options)
diff --git a/workflow/engine/methods/dynaforms/fields_Save.php b/workflow/engine/methods/dynaforms/fields_Save.php
index 7786cab61..63757294d 100755
--- a/workflow/engine/methods/dynaforms/fields_Save.php
+++ b/workflow/engine/methods/dynaforms/fields_Save.php
@@ -116,6 +116,15 @@ if (($RBAC_Response=$RBAC->userCanAccess("PM_FACTORY"))!=1) return $RBAC_Respons
         $_POST['form']['PME_DELETEROW'] = '0';
       }
     }
+    if ($type==='dropdown' || $type==='listbox' ) {
+      if(isset($_POST['form']['PME_OPTIONS'][1])){
+        if($_POST['form']['PME_OPTIONS']['1']['NAME'] === "" &&
+           $_POST['form']['PME_OPTIONS']['1']['LABEL'] === ""){
+             unset($_POST['form']['PME_OPTIONS']);
+           }
+      }
+    }
+
   }
   foreach($_POST['form'] as $key => $value){
     if (substr($key,0,4)==='PME_')
@@ -214,7 +223,7 @@ if (($RBAC_Response=$RBAC->userCanAccess("PM_FACTORY"))!=1) return $RBAC_Respons
   $_SESSION['_DBArray'] = $_DBArray;
 
   // Additions to javascript
-  if($sType === 'javascript'){
+  if(isset($sType) && $sType === 'javascript'){
     $sCode     = $pmeCode;
     $editor = new dynaformEditorAjax($_POST);
     $editor->set_javascript($A, $fieldName, $sCode);