Index: trunk/kernel/parser.php
===================================================================
diff -u -N -r1063 -r1080
--- trunk/kernel/parser.php	(.../parser.php)	(revision 1063)
+++ trunk/kernel/parser.php	(.../parser.php)	(revision 1080)
@@ -504,7 +504,7 @@
 */
 function m_form_option($attribs = array())
 {
-    global $FormValues;
+    global $FormValues, $objSession;
 
     $html_attribs = ExtraAttributes($attribs); 
     $field = $attribs["_field"];
@@ -516,11 +516,13 @@
     }
     else
     { 
-    	$value = $FormValues[$attribs['_form']][$field];
+    	$value = isset($FormValues[$attribs['_form']][$field]) ? $FormValues[$attribs['_form']][$field] : strtoupper($objSession->GetPersistantVariable($field));
     }   
     
     $selected = ($val == $value)? "SELECTED" : "";
     
+    //echo "Sel $field = $value: $selected<br>";
+    
     if( getArrayValue($attribs,'_langtext') )
     {
         $txt = language($attribs["_langtext"]);