Index: admin_templates/custom_fields/custom_fields_edit.tpl
===================================================================
--- admin_templates/custom_fields/custom_fields_edit.tpl	(revision 13329)
+++ admin_templates/custom_fields/custom_fields_edit.tpl	(working copy)
@@ -69,7 +69,7 @@
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="cf" field="OnGeneralTab" title="!la_prompt_showgeneraltab!"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="cf" field="Heading" title="!la_prompt_heading!" size="40"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="cf" field="Prompt" title="!la_prompt_FieldPrompt!" size="40"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="cf" field="ElementType" title="!la_prompt_InputType!" size="20" onchange="update_layout();"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="cf" field="ElementType" title="!la_prompt_InputType!" size="20" has_empty="1" onchange="update_layout();"/>
 
 			<inp2:m_if check="cf_Field" name="ElementType" equals_to="select|multiselect|radio" db="db" inverse="inverse">
 				<inp2:m_RenderElement name="inp_edit_box" prefix="cf" field="ValueList" title="!la_prompt_valuelist!" size="40"/>
Index: admin_templates/forms/form_field_edit.tpl
===================================================================
--- admin_templates/forms/form_field_edit.tpl	(revision 13329)
+++ admin_templates/forms/form_field_edit.tpl	(working copy)
@@ -40,7 +40,7 @@
 		<inp2:m_RenderElement name="subsection" prefix="" fields="Prompt,ElementType,Validation,ValueList,DefaultValue,Priority,Required,DisplayInGrid" title="!la_tab_AdminUI!"/>
 			<!--<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="Heading" title="!la_prompt_heading!" size="40"/>-->
 			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="Prompt" title="!la_prompt_FieldPrompt!" size="40"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="formflds" field="ElementType" title="!la_prompt_InputType!"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="formflds" field="ElementType" title="!la_prompt_InputType!" has_empty="1"/>
 			<inp2:m_RenderElement name="inp_edit_options" prefix="formflds" field="Validation" title="!la_prompt_validation!"/>
 			<inp2:m_RenderElement name="inp_edit_textarea" prefix="formflds" field="ValueList" title="!la_prompt_ValueList!" allow_html="0" cols="40" rows="5"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="DefaultValue" title="!la_prompt_DefaultValue!" size="40"/>
Index: units/custom_fields/custom_fields_config.php
===================================================================
--- units/custom_fields/custom_fields_config.php	(revision 13329)
+++ units/custom_fields/custom_fields_config.php	(working copy)
@@ -100,7 +100,7 @@
 													),
 										            'Heading' => Array('type' => 'string', 'required' => 1, 'default' => null),
 										            'Prompt' => Array('type' => 'string','default' => null),
-										            'ElementType' => Array('required'=>'1', 'type'=>'string', 'not_null'=>1, 'default'=>'', 'formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array('' => 'la_EmptyValue', 'text' => 'la_type_text', 'select' => 'la_type_select', 'multiselect' => 'la_type_multiselect', 'radio' => 'la_type_radio', 'checkbox' => 'la_type_checkbox', 'password' => 'la_type_password', 'textarea' => 'la_type_textarea', 'label' => 'la_type_label', 'date' => 'la_type_date', 'datetime' => 'la_type_datetime')),
+										            'ElementType' => Array('required'=>'1', 'type'=>'string', 'not_null'=>1, 'default'=>'', 'formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array('text' => 'la_type_text', 'select' => 'la_type_select', 'multiselect' => 'la_type_multiselect', 'radio' => 'la_type_radio', 'checkbox' => 'la_type_checkbox', 'password' => 'la_type_password', 'textarea' => 'la_type_textarea', 'label' => 'la_type_label', 'date' => 'la_type_date', 'datetime' => 'la_type_datetime')),
 										            'ValueList' => Array('type' => 'string','default' => null),
 										            'DefaultValue' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
 										            'DisplayOrder' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
@@ -109,7 +109,7 @@
 														'formatter' => 'kOptionsFormatter',
 														'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1,
 														'not_null' => 1, 'default' => 0,
-													),													
+													),
 										            'IsSystem' => Array (
 														'type' => 'int',
 														'formatter' => 'kOptionsFormatter',
@@ -123,7 +123,7 @@
 														'not_null' => 1, 'default' => 0,
 													),
 					),
-					
+
 					'VirtualFields'	=> 	Array(
 													'Value'			=>	Array('type' => 'string', 'default' => ''),
 													'OriginalValue'	=>	Array('type' => 'string', 'default' => ''),
Index: units/form_fields/form_fields_config.php
===================================================================
--- units/form_fields/form_fields_config.php	(revision 13329)
+++ units/form_fields/form_fields_config.php	(working copy)
@@ -66,7 +66,7 @@
 			            'Prompt' => Array('type' => 'string', 'default' => null, 'required' => 1),
 			            'ElementType' => Array(
 			            	'type' => 'string',
-			            	'formatter' => 'kOptionsFormatter', 'options' => Array ('' => 'la_EmptyValue', 'text' => 'la_type_text', 'select' => 'la_type_select', 'radio' => 'la_type_radio', 'checkbox' => 'la_type_SingleCheckbox', 'password' => 'la_type_password', 'textarea' => 'la_type_textarea', 'label' => 'la_type_label'), 'use_phrases' => 1,
+			            	'formatter' => 'kOptionsFormatter', 'options' => Array ('text' => 'la_type_text', 'select' => 'la_type_select', 'radio' => 'la_type_radio', 'checkbox' => 'la_type_SingleCheckbox', 'password' => 'la_type_password', 'textarea' => 'la_type_textarea', 'label' => 'la_type_label'), 'use_phrases' => 1,
 			            	'required' => 1, 'not_null' => 1, 'default' => '',
 			            ),
 			            'ValueList' => Array('type' => 'string','default' => null),