Index: branches/1.0.x/checkout.tpl
===================================================================
diff -u -r14814 -r14817
--- branches/1.0.x/checkout.tpl	(.../checkout.tpl)	(revision 14814)
+++ branches/1.0.x/checkout.tpl	(.../checkout.tpl)	(revision 14817)
@@ -188,14 +188,17 @@
 
 					$( FormManager.getField('ord', 'Shipping' + $field) ).change(
 						function ($e) {
-							if ( $me.isAddressValid('Shipping') ) {
-								$me.updateOrder(
-									'elements/ajax/shipping_type',
-									function ($data) {
-										$('#shipping-type-container').html($data);
-									}
-								);
+							if ( !$me.isAddressValid('Shipping') ) {
+								$('select', '#shipping-type-container').empty().append('<option value="">Please enter address</option>');
+								return ;
 							}
+
+							$me.updateOrder(
+								'elements/ajax/shipping_type',
+								function ($data) {
+									$('#shipping-type-container').html($data);
+								}
+							);
 						}
 					);
 				}
Index: branches/1.0.x/elements/ajax/shipping_type.tpl
===================================================================
diff -u -r14814 -r14817
--- branches/1.0.x/elements/ajax/shipping_type.tpl	(.../shipping_type.tpl)	(revision 14814)
+++ branches/1.0.x/elements/ajax/shipping_type.tpl	(.../shipping_type.tpl)	(revision 14817)
@@ -1,10 +1,24 @@
-<inp2:m_if check="m_Get" name="ajax" equals_to="yes">
-	shipping types here: <inp2:ord_Field name="OrderId"/>
-</inp2:m_if>
+<inp2:m_DefineElement name="no_shipments">
+	<div class="field-error"><inp2:m_Recall name="usps_errors"/></div>
+	<inp2:m_Phrase label="lu_comm_ErrorNoShippingTypes"/><!-- (<a href="mailto:<inp2:conf_ConfigValue name="Comm_Contacts_Email"/>"><inp2:conf_ConfigValue name="Comm_Contacts_Email"/></a>).-->
+</inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="order_shipping_type">
+	<option <inp2:m_param name="selected"/> value="<inp2:m_param name='ShippingId'/>"><inp2:m_param name="ShippingName"/> (<inp2:m_if check="m_param" name="ShippingFree" value="1"><inp2:m_Phrase label="lu_comm_FreeShipping" /><inp2:m_else/><inp2:m_param name="TotalCost"/></inp2:m_if>)</option>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="order_shipment">
+	<select class="field" name="<inp2:m_param name='field_name'/>">
+		<inp2:ord_PrintShippingTypes render_as="order_shipping_type" currency="selected"/>
+	</select>
+</inp2:m_DefineElement>
+
 <label for="ship">How would you like the items shipped? <span class="star">*</span></label>
-<select id="ship" class="field">
-	<option value="" selected="selected">FedEx Ground (Next Day) $14.00</option>
-	<option value="">USA</option>
-	<option value="">Russia</option>
-</select>
\ No newline at end of file
+
+<inp2:m_if check="ord_AddressValid" type="shipping">
+	<inp2:ord_PrintShippings render_as="order_shipment" currency="selected" no_shipments_render_as="no_shipments"/>
+<inp2:m_else/>
+	<select class="field" name="<inp2:ord_InputName name='ShippingTypeId'/>[1]">
+		<option value="">Please enter address</option>
+	</select>
+</inp2:m_if>