Index: trunk/kernel/parser.php
===================================================================
diff -u -r2508 -r2729
--- trunk/kernel/parser.php	(.../parser.php)	(revision 2508)
+++ trunk/kernel/parser.php	(.../parser.php)	(revision 2729)
@@ -348,7 +348,13 @@
       $value = $_POST[$field];
     }
     else
+    {
         $value = $FormValues[$form][$field];
+        if (is_array($value))
+        {
+        		$value = is_null($value['lang_value'])? $value['value'] : $value['lang_value'];
+        }
+    }
     //echo "POST_VALUE: [$value] vs USER_VALUE: [".$attribs['_value']."]<br>";
 	return $value == $attribs['_value'] ? 1 : '';
 }
@@ -376,7 +382,10 @@
     else {
     	if (getArrayValue($attribs,'_forgetvalue') != 1 && getArrayValue($FormValues[$form],$field) ) {
         	$value = $FormValues[$form][$field];
-        	if (is_array($value)) $value = $value['value'];
+        	if (is_array($value))
+        	{
+        		$value = is_null($value['lang_value'])? $value['value'] : $value['lang_value'];
+        	}
         	$value = inp_htmlize($value);
     	}
     }
@@ -504,8 +513,13 @@
     	$value = '';
     }
     else 
-    {        
+    {   
     	$value =  inp_htmlize($FormValues[$form][$field], 1);
+    	if (is_array($value))
+        {
+        	$value = is_null($value['lang_value'])? $value['value'] : $value['lang_value'];
+        }     
+    	$value =  inp_htmlize($value, 1);
     }
     //echo "<pre>"; print_r($FormValues); echo "</pre>";
     return $value;
@@ -527,17 +541,20 @@
     global $FormValues, $objSession;
 
     $html_attribs = ExtraAttributes($attribs); 
-    $field = $attribs["_field"];
-    $val = $attribs["_value"];
+    $field = getArrayValue($attribs, "_field");
+    $form = getArrayValue($attribs, "_form");
+    $val = getArrayValue($attribs, "_value");
     
     if(isset($_POST[$field]))
     {    
         $value = $_POST[$field];
     }
     else
     { 
-    	$value = isset($FormValues[$attribs['_form']][$field]) ? $FormValues[$attribs['_form']][$field] : $objSession->GetPersistantVariable($field);
-    	if (is_array($value)) $value = $value['value'];
+    	$value = isset($FormValues[$form][$field]) ? $FormValues[$form][$field] : $objSession->GetPersistantVariable($field);
+    	// No need to read lan_value since it's options/drop-down field
+    	if (is_array($value)) 
+    		$value = $value['value'];
     }   
     
     $selected = (strtolower($val) == strtolower($value))? "SELECTED" : "";