Index: admin_templates/custom_fields/custom_fields_edit.tpl
===================================================================
--- admin_templates/custom_fields/custom_fields_edit.tpl	(revision 13268)
+++ 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 13268)
+++ 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: install/english.lang
===================================================================
--- install/english.lang	(revision 13268)
+++ install/english.lang	(working copy)
@@ -508,7 +508,6 @@
 			<PHRASE Label="la_EditingInProgress" Module="Core" Type="1">WW91IGhhdmUgbm90IHNhdmVkIGNoYW5nZXMgdG8gdGhlIGl0ZW0geW91IGFyZSBlZGl0aW5nITxiciAvPkNsaWNrIE9LIHRvIGxvb3NlIGNoYW5nZXMgYW5kIGdvIHRvIHRoZSBzZWxlY3RlZCBzZWN0aW9uPGJyIC8+b3IgQ2FuY2VsIHRvIHN0YXkgaW4gdGhlIGN1cnJlbnQgc2VjdGlvbi4=</PHRASE>
 			<PHRASE Label="la_editor_default_style" Module="Core" Type="1">RGVmYXVsdCB0ZXh0</PHRASE>
 			<PHRASE Label="la_EmptyFile" Module="Core" Type="1">RmlsZSBpcyBlbXB0eQ==</PHRASE>
-			<PHRASE Label="la_EmptyValue" Module="Core" Type="1">IA==</PHRASE>
 			<PHRASE Label="la_empty_file" Module="Core" Type="1">RmlsZSBpcyBlbXB0eQ==</PHRASE>
 			<PHRASE Label="la_Enabled" Module="Core" Type="1">RW5hYmxlZA==</PHRASE>
 			<PHRASE Label="la_error_cant_save_file" Module="Core" Type="1">Q2FuJ3Qgc2F2ZSBhIGZpbGU=</PHRASE>
@@ -1641,6 +1640,11 @@
 			<PHRASE Label="lu_opt_Cookies" Module="Core" Type="1">Q29va2llcw==</PHRASE>
 			<PHRASE Label="lu_opt_QueryString" Module="Core" Type="1">UXVlcnkgU3RyaW5nIChTSUQp</PHRASE>
 			<PHRASE Label="lu_PermName_Admin_desc" Module="Core" Type="1">QWRtaW4gTG9naW4=</PHRASE>
+			<PHRASE Label="lu_PermName_Category.AddPending_desc" Module="Core" Type="2">QWRkIFBlbmRpbmcgQ2F0ZWdvcnk=</PHRASE>
+			<PHRASE Label="lu_PermName_Category.Add_desc" Module="Core" Type="2">QWRkIENhdGVnb3J5</PHRASE>
+			<PHRASE Label="lu_PermName_Category.Delete_desc" Module="Core" Type="2">RGVsZXRlIENhdGVnb3J5</PHRASE>
+			<PHRASE Label="lu_PermName_Category.Modify_desc" Module="Core" Type="2">TW9kaWZ5IENhdGVnb3J5</PHRASE>
+			<PHRASE Label="lu_PermName_Category.View_desc" Module="Core" Type="2">VmlldyBDYXRlZ29yeQ==</PHRASE>
 			<PHRASE Label="lu_PermName_Debug.Info_desc" Module="Core" Type="1">QXBwZW5kIHBocGluZm8gdG8gYWxsIHBhZ2VzIChEZWJ1Zyk=</PHRASE>
 			<PHRASE Label="lu_PermName_Debug.Item_desc" Module="Core" Type="1">RGlzcGxheSBJdGVtIFF1ZXJpZXMgKERlYnVnKQ==</PHRASE>
 			<PHRASE Label="lu_PermName_Debug.List_desc" Module="Core" Type="1">RGlzcGxheSBJdGVtIExpc3QgUXVlcmllcyAoRGVidWcp</PHRASE>
@@ -1648,11 +1652,6 @@
 			<PHRASE Label="lu_PermName_Login_desc" Module="Core" Type="1">QWxsb3cgTG9naW4=</PHRASE>
 			<PHRASE Label="lu_PermName_Profile.Modify_desc" Module="Core" Type="1">Q2hhbmdlIFVzZXIgUHJvZmlsZXM=</PHRASE>
 			<PHRASE Label="lu_PermName_ShowLang_desc" Module="Core" Type="1">U2hvdyBMYW5ndWFnZSBUYWdz</PHRASE>
-			<PHRASE Label="lu_PermName_Category.AddPending_desc" Module="Core" Type="2">QWRkIFBlbmRpbmcgQ2F0ZWdvcnk=</PHRASE>
-			<PHRASE Label="lu_PermName_Category.Add_desc" Module="Core" Type="2">QWRkIENhdGVnb3J5</PHRASE>
-			<PHRASE Label="lu_PermName_Category.Delete_desc" Module="Core" Type="2">RGVsZXRlIENhdGVnb3J5</PHRASE>
-			<PHRASE Label="lu_PermName_Category.Modify_desc" Module="Core" Type="2">TW9kaWZ5IENhdGVnb3J5</PHRASE>
-			<PHRASE Label="lu_PermName_Category.View_desc" Module="Core" Type="2">VmlldyBDYXRlZ29yeQ==</PHRASE>
 		</PHRASES>
 		<EVENTS>
 			<EVENT MessageType="html" Event="CATEGORY.ADD" Type="0">U3ViamVjdDogTmV3IENhdGVnb3J5ICI8aW5wMjpjX0ZpZWxkIG5hbWU9Ik5hbWUiLz4iIC0gQWRkZWQKCllvdXIgc3VnZ2VzdGVkIGNhdGVnb3J5ICI8aW5wMjpjX0ZpZWxkIG5hbWU9Ik5hbWUiLz4iIGhhcyBiZWVuIGFkZGVkLg==</EVENT>
Index: units/custom_fields/custom_fields_config.php
===================================================================
--- units/custom_fields/custom_fields_config.php	(revision 13268)
+++ units/custom_fields/custom_fields_config.php	(working copy)
@@ -96,7 +96,7 @@
 										            'MultiLingual' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1),
 										            '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),
Index: units/form_fields/form_fields_config.php
===================================================================
--- units/form_fields/form_fields_config.php	(revision 13268)
+++ units/form_fields/form_fields_config.php	(working copy)
@@ -67,7 +67,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),