2470a2471,2475
>         // Fill the session with defaultvalue
>         if (isset($field['defaultvalue']))
>         {
>             $_SESSION[$field['fieldname']]=$field['defaultvalue'];
>         }

1829,1833d1828
<             elseif ($ansrow['code']==$_SESSION['fieldmap'][$ia[1]]['defaultvalue'])
<             {
<                 $opt_select = SELECTED;
<                 $defexists=true;
<             }
1848c1843
<                 $defaultopts[] = array ( 'code' => $ansrow['code'], 'answer' => $answertext, 'default_value' => $_SESSION['fieldmap'][$ia[1]]['defaultvalue']);
---
>                 $defaultopts[] = array ( 'code' => $ansrow['code'], 'answer' => $answertext);
1852c1847
<                 $optgroups[$categorytext][] = array ( 'code' => $ansrow['code'], 'answer' => $answertext, 'default_value' => $_SESSION['fieldmap'][$ia[1]]['defaultvalue']);
---
>                 $optgroups[$categorytext][] = array ( 'code' => $ansrow['code'], 'answer' => $answertext);
1869,1873d1863
<                 elseif ($optionarray['default_value'] == 'Y')
<                 {
<                     $opt_select = SELECTED;
<                     $defexists = 'Y';
<                 }
1892,1896d1881
<             elseif ($optionarray['default_value'] == 'Y')
<             {
<                 $opt_select = SELECTED;
<                 $defexists = 'Y';
<             }
2116,2120d2100
<         elseif ($ansrow['code']==$_SESSION['fieldmap'][$ia[1]]['defaultvalue'])
<         {
<             $check_ans = CHECKED;
<             $defexists=true;
<         }
2344,2348d2323
<             elseif ($ansrow['code']==$_SESSION['fieldmap'][$ia[1]]['defaultvalue'])
<             {
<                 $check_ans = CHECKED;
<                 $defexists=true;
<             }
2414,2418d2388
<             elseif ($ansrow['code']==$_SESSION['fieldmap'][$ia[1]]['defaultvalue'])
<             {
<                 $check_ans = CHECKED;
<                 $defexists=true;
<             }
2921,2926d2890
<         // Or if the question is marked as a default selection, check the checkbox
<         elseif ($_SESSION['fieldmap'][$ia[1].$ansrow['title']]['defaultvalue']=='Y')
<         {
<             $answer .= CHECKED;
<         }            
< 
2973,2977d2936
<         // Or if the question is marked as a default selection, check the checkbox
<         elseif ($_SESSION['fieldmap'][$ia[1].$ansrow['title']]['defaultvalue']=='Y')
<         {
<             $answer .= 'Y';
<         }            
3337,3340d3295
<         elseif ($_SESSION['fieldmap'][$ia[1].$ansrow['title']]['defaultvalue']=='Y')
<         {
<             $answer_main .= CHECKED;
<         }            
3353,3356d3307
<         elseif ($_SESSION['fieldmap'][$ia[1].$ansrow['title']]['defaultvalue']=='Y')
<         {
<             $answer_main .= 'Y';
<         }