Index: branches/1.1.x/in-commerce/elements/content_boxes/checkout/billing_address.elm.tpl
===================================================================
diff -u -N -r13088 -r13468
--- branches/1.1.x/in-commerce/elements/content_boxes/checkout/billing_address.elm.tpl	(.../billing_address.elm.tpl)	(revision 13088)
+++ branches/1.1.x/in-commerce/elements/content_boxes/checkout/billing_address.elm.tpl	(.../billing_address.elm.tpl)	(revision 13468)
@@ -51,7 +51,7 @@
 			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingCity" title="lu_fld_City" style="width: 200px;" />
 			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingState" title="lu_fld_State" style="width: 200px;" />
 			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingZip" title="lu_fld_Zip" style="width: 100px;" />
-			<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="BillingCountry" title="lu_fld_Country" style="width: 300px;" />
+			<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="BillingCountry" title="lu_fld_Country" style="width: 300px;" has_empty="1"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingPhone" title="lu_fld_Phone" style="width: 150px;" />
 			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingEmail" title="lu_fld_Email" style="width: 150px;" is_last="1"/>
 		</inp2:m_if>
Index: branches/1.1.x/in-commerce/my_account/edit_address.tpl
===================================================================
diff -u -N -r13088 -r13468
--- branches/1.1.x/in-commerce/my_account/edit_address.tpl	(.../edit_address.tpl)	(revision 13088)
+++ branches/1.1.x/in-commerce/my_account/edit_address.tpl	(.../edit_address.tpl)	(revision 13468)
@@ -69,7 +69,7 @@
 							<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="City" title="lu_fld_City"/>
 							<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="State" title="lu_fld_State"/>
 							<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Zip" title="lu_fld_ZipCode"/>
-							<inp2:m_RenderElement name="inp_edit_options" prefix="addr" field="Country" title="lu_fld_Country"/>
+							<inp2:m_RenderElement name="inp_edit_options" prefix="addr" field="Country" title="lu_fld_Country" has_empty="1"/>
 							<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Phone" title="lu_fld_Phone"/>
 							<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Fax" title="lu_fld_Fax"/>
 							<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Email" title="lu_fld_Email"/>
Index: branches/1.1.x/in-commerce/elements/content_boxes/checkout/shipping_address.elm.tpl
===================================================================
diff -u -N -r13088 -r13468
--- branches/1.1.x/in-commerce/elements/content_boxes/checkout/shipping_address.elm.tpl	(.../shipping_address.elm.tpl)	(revision 13088)
+++ branches/1.1.x/in-commerce/elements/content_boxes/checkout/shipping_address.elm.tpl	(.../shipping_address.elm.tpl)	(revision 13468)
@@ -40,7 +40,7 @@
 			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCity" title="lu_fld_City" style="width: 200px;" />
 			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingState" title="lu_fld_State" style="width: 200px;" />
 			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingZip" title="lu_fld_Zip" style="width: 100px;" />
-			<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="ShippingCountry" title="lu_fld_Country" style="width: 300px;" />
+			<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="ShippingCountry" title="lu_fld_Country" style="width: 300px;" has_empty="1"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingPhone" title="lu_fld_Phone" style="width: 150px;" />
 			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingEmail" title="lu_fld_Email" style="width: 150px;" is_last="1"/>
 		</inp2:m_if>
Index: branches/1.1.x/in-commerce/my_account/new_address.tpl
===================================================================
diff -u -N -r13088 -r13468
--- branches/1.1.x/in-commerce/my_account/new_address.tpl	(.../new_address.tpl)	(revision 13088)
+++ branches/1.1.x/in-commerce/my_account/new_address.tpl	(.../new_address.tpl)	(revision 13468)
@@ -68,7 +68,7 @@
 							<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="City" title="lu_fld_City"/>
 							<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="State" title="lu_fld_State"/>
 							<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Zip" title="lu_fld_ZipCode"/>
-							<inp2:m_RenderElement name="inp_edit_options" prefix="addr" field="Country" title="lu_fld_Country"/>
+							<inp2:m_RenderElement name="inp_edit_options" prefix="addr" field="Country" title="lu_fld_Country" has_empty="1"/>
 							<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Phone" title="lu_fld_Phone"/>
 							<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Fax" title="lu_fld_Fax"/>
 							<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Email" title="lu_fld_Email"/>