Index: branches/1.0.x/checkout.tpl
===================================================================
diff -u -r14830 -r15028
--- branches/1.0.x/checkout.tpl	(.../checkout.tpl)	(revision 14830)
+++ branches/1.0.x/checkout.tpl	(.../checkout.tpl)	(revision 15028)
@@ -51,9 +51,7 @@
 					<inp2:m_RenderElement name="inp_edit_address" prefix="ord" field="BillingAddress1" field2="BillingAddress2" title="lu_fld_Address"/>
 					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingCity" title="lu_fld_City"/>
 					<inp2:m_RenderElement name="inp_edit_country" prefix="ord" field="BillingCountry" state_field="BillingState" title="lu_fld_Country" has_empty="1" empty_label="lu_opt_SelectCountry"/>
-
-					<!-- TODO: preload states by country -->
-					<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="BillingState" title="lu_fld_State" has_empty="1" row_class="alt1"/>
+					<inp2:m_RenderElement name="inp_edit_state" prefix="ord" field="BillingState" title="lu_fld_State" has_empty="1" row_class="alt1"/>
 					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingZip" title="lu_fld_Zip" row_class="alt2"/>
 					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingPhone" title="lu_fld_Phone"/>
 				</fieldset>
@@ -138,9 +136,7 @@
 						<inp2:m_RenderElement name="inp_edit_address" prefix="ord" field="ShippingAddress1" field2="ShippingAddress2" title="lu_fld_Address"/>
 						<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCity" title="lu_fld_City"/>
 						<inp2:m_RenderElement name="inp_edit_country" prefix="ord" field="ShippingCountry" state_field="ShippingState" title="lu_fld_Country" has_empty="1" empty_label="lu_opt_SelectCountry"/>
-
-						<!-- TODO: preload states by country -->
-						<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="ShippingState" title="lu_fld_State" has_empty="1" row_class="alt1"/>
+						<inp2:m_RenderElement name="inp_edit_state" prefix="ord" field="ShippingState" title="lu_fld_State" has_empty="1" row_class="alt1"/>
 						<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingZip" title="lu_fld_Zip" row_class="alt2"/>
 					</div>
 
Index: branches/1.0.x/elements/ajax/register.tpl
===================================================================
diff -u -r14822 -r15028
--- branches/1.0.x/elements/ajax/register.tpl	(.../register.tpl)	(revision 14822)
+++ branches/1.0.x/elements/ajax/register.tpl	(.../register.tpl)	(revision 15028)
@@ -28,8 +28,7 @@
 			<inp2:m_RenderElement name="inp_edit_address" prefix="u.register" field="Street" field2="Street2" title="lu_fld_Address"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="City"/>
 			<inp2:m_RenderElement name="inp_edit_country" prefix="u.register" field="Country" state_field="State" has_empty="1" empty_label="lu_opt_SelectCountry"/>
-
-			<inp2:m_RenderElement name="inp_edit_options" prefix="u.register" field="State" has_empty="1"/>
+			<inp2:m_RenderElement name="inp_edit_state" prefix="u.register" field="State" has_empty="1"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Zip" row_class="alt2"/>
 
 			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Phone"/>
Index: branches/1.0.x/elements/forms.elm.tpl
===================================================================
diff -u -r14822 -r15028
--- branches/1.0.x/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 14822)
+++ branches/1.0.x/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 15028)
@@ -365,30 +365,61 @@
 		</select>
 
 		<script type="text/javascript">
+			function transform_state_control($control, $has_options) {
+				var	$id = $control.attr('id'),
+					$tab_index = $control.attr('tabindex'),
+					$was_dropdown = $control.is('select'),
+					$is_dropdown = $was_dropdown;
+
+				if ( !$has_options && $was_dropdown ) {
+					// convert to textbox
+					$control.replaceWith('<input type="text" class="field" id="' + $id + '" name="' + $id + '" tabindex="' + $tab_index + '" value=""/>');
+					$is_dropdown = false;
+				}
+				else if ( $has_options && !$was_dropdown ) {
+					// convert to dropdown
+					$control.replaceWith('<select class="field" id="' + $id + '" name="' + $id + '" tabindex="' + $tab_index + '"></select>');
+					$is_dropdown = true;
+				}
+
+				if ( $was_dropdown != $is_dropdown ) {
+					$('#' + jq($id)).blur(
+						function ($e) {
+							FormManager.checkField(this);
+						}
+					);
+				}
+			}
+
 			$(document).ready(
 				function () {
 					var $field_mask = '<inp2:$prefix_InputName field="#FIELD_NAME#" js_escape="1"/>';
 
 					$( get_control($field_mask, '<inp2:m_Param name="field"/>') ).change(
 						function ($e) {
 							var	$me = $(this),
-								$state_dropdown = $( get_control($field_mask, $me.attr('state_field')) ),
+								$state_control = $( get_control($field_mask, $me.attr('state_field')) ),
 								$url = '<inp2:m_Link country-state_event="OnGetStatesJSON" country_iso="#ISO#" pass="m,country-state" no_amp="1" js_escape="1"/>';
 
 							$.getJSON(
 								$url.replace('#ISO#', $me.val()),
 								function ($states) {
-									var $selected = $state_dropdown.val();
+									var $selected = $state_control.val();
 
-									$state_dropdown.empty().append('<option value=""></option>');
+									transform_state_control($state_control, !$.isArray($states));
+									$state_control = $( get_control($field_mask, $me.attr('state_field')) );
 
-									if ( !$.isArray($states) ) {
-										for (var $state_iso in $states) {
-											$state_dropdown.append('<option value="' + $state_iso + '">' + $states[$state_iso] + '</option>');
+									if ( $state_control.is('select') ) {
+										$state_control.empty().append('<option value=""></option>');
+
+										if ( !$.isArray($states) ) {
+											for (var $state_iso in $states) {
+												$state_control.append('<option value="' + $state_iso + '">' + $states[$state_iso] + '</option>');
+											}
 										}
 									}
 
-									$state_dropdown.val($selected);
+									$state_control.val($selected);
 								}
 							);
 						}
@@ -399,6 +430,18 @@
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="inp_edit_state" title="lu_fld_{$field}" state_field="" style="" has_empty="0" empty_value="" empty_label="" field_type="select" no_editing="1">
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<inp2:m_if check="{$prefix}_FieldOption" field="$field" option="options">
+			<select class="field" tabindex="<inp2:m_get param='tab_index'/>" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>">
+				<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_item" selected="selected" has_empty="$has_empty" empty_value="$empty_value" empty_label="$empty_label"/>
+			</select>
+		<inp2:m_else/>
+			<input type="text" class="field" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>"/>
+		</inp2:m_if>
+	</inp2:m_RenderElement>
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="inp_radio_item" style="" onclick="" has_br="0">
 	<input type="radio" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>" <inp2:m_param name="checked"/> name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:{$prefix}_InputName field="$field"/>_<inp2:m_param name="key"/>">&nbsp;<inp2:m_param name="option"/></label><inp2:m_if check="m_Param" name="has_br"><br/><inp2:m_else/>&nbsp;&nbsp;</inp2:m_if>
 </inp2:m_DefineElement>