Index: branches/1.1.x/platform/blocks/login/form_register.tpl
===================================================================
diff -u -r13091 -r13469
--- branches/1.1.x/platform/blocks/login/form_register.tpl	(.../form_register.tpl)	(revision 13091)
+++ branches/1.1.x/platform/blocks/login/form_register.tpl	(.../form_register.tpl)	(revision 13469)
@@ -171,8 +171,7 @@
 							</td>
 							<td>
 								<select name="<inp2:u_InputName field="Country"/>" style="width: 300px;">
-										<option value=""></option>
-										<inp2:u_PredefinedOptions field="Country" render_as="destination" selected_param="selected" selected="selected=\"selected\""/>
+									<inp2:u_PredefinedOptions field="Country" render_as="destination" has_empty="1" selected_param="selected" selected="selected=\"selected\""/>
 								</select>
 							</td>
 							<td class="error"><inp2:u_Error field="Country"/></td>
Index: branches/1.1.x/in-commerce/blocks/my_account/address_edit.tpl
===================================================================
diff -u -r13091 -r13469
--- branches/1.1.x/in-commerce/blocks/my_account/address_edit.tpl	(.../address_edit.tpl)	(revision 13091)
+++ branches/1.1.x/in-commerce/blocks/my_account/address_edit.tpl	(.../address_edit.tpl)	(revision 13469)
@@ -107,8 +107,7 @@
 							<strong><inp2:m_phrase label="lu_country"/> *:</strong></td>
 						<td>
 							<select name="<inp2:addr_InputName field="Country"/>" style="width: 300px;">
-								<option value=""></option>
-								<inp2:addr_PredefinedOptions field="Country" render_as="destination" selected_param="selected" selected="selected=\"selected\""/>
+								<inp2:addr_PredefinedOptions field="Country" render_as="destination" has_empty="1" selected_param="selected" selected="selected=\"selected\""/>
 							</select>
 						</td>
 						<td class="error"><inp2:addr_Error field="Country"/></td>
Index: branches/1.1.x/in-commerce/blocks/my_account/my_profile.tpl
===================================================================
diff -u -r13091 -r13469
--- branches/1.1.x/in-commerce/blocks/my_account/my_profile.tpl	(.../my_profile.tpl)	(revision 13091)
+++ branches/1.1.x/in-commerce/blocks/my_account/my_profile.tpl	(.../my_profile.tpl)	(revision 13469)
@@ -4,13 +4,13 @@
 
 <form method="post" action="<inp2:m_FormAction />">
 
-<table class="block-no-border"> 
-	<tr> 
+<table class="block-no-border">
+	<tr>
 		<td class="block-header" colspan="2">
 			<inp2:m_Phrase label="lu_comm_PersonalInfo"/>
-			
-		</td> 
-	</tr> 
+
+		</td>
+	</tr>
 	<tr>
 		<td class="block-data">
 			<inp2:m_if check="u_HasError" field="any">
@@ -20,28 +20,28 @@
 							<img src="img/message.gif" alt="" width="19" height="19" />
 							<span class="warning-text"><inp2:m_Phrase label="lu_Warning"/></span><br />
 							<inp2:m_Phrase label="lu_AProblemWithForm"/>
-							
+
 						</td>
 					</tr>
 				</table>
 			</inp2:m_if>
 			<strong>* <inp2:m_Phrase label="lu_IndicatesRequired"/>.</strong> 	<br /><br />
-	
+
 			<table class="form-data">
-				<tr> 
+				<tr>
 					<td class="block-data">
 						<strong><inp2:m_Phrase label="lu_Password"/>:</strong>
-					</td> 
+					</td>
 					<td class="block-data">
 						<input type="password" name="<inp2:u_InputName field="Password"/>" value="" style="width: 100px;" />
 					</td>
 					<td width="170" class="error"><inp2:u_Error field="Password"/></td>
 				</tr>
-		
-				<tr> 
+
+				<tr>
 					<td class="block-data">
 						<strong><inp2:m_Phrase label="lu_VerifyPassword"/>:</strong>
-					</td> 
+					</td>
 					<td class="block-data">
 						<input type="password" name="<inp2:u_InputName field="VerifyPassword"/>" value="" style="width: 100px;" />
 					</td>
@@ -57,7 +57,7 @@
 					</td>
 					<td width="170" class="error"><inp2:u_Error field="FirstName"/></td>
 				</tr>
-					
+
 				<tr>
 					<td class="block-data">
 						<strong><inp2:m_Phrase label="lu_comm_LastName"/>:</strong>
@@ -67,7 +67,7 @@
 					</td>
 					<td width="170" class="error"><inp2:u_Error field="LastName"/></td>
 				</tr>
-				
+
 				<tr>
 					<td class="block-data">
 						<strong><inp2:m_Phrase label="lu_company"/>:</strong>
@@ -77,31 +77,31 @@
 					</td>
 					<td width="170" class="error"><inp2:u_Error field="Company"/></td>
 				</tr>
-					
-				<tr> 
+
+				<tr>
 					<td class="block-data">
 						<strong><inp2:m_Phrase label="lu_Phone"/>:</strong>
-					</td> 
+					</td>
 					<td class="block-data">
 						<input type="text" name="<inp2:u_InputName field="Phone"/>" value="<inp2:u_Field name="Phone"/>" style="width: 150px;" />
 					</td>
 					<td width="170" class="error"><inp2:u_Error field="Phone"/></td>
 				</tr>
-				
-				<tr> 
+
+				<tr>
 					<td class="block-data">
 						<strong><inp2:m_Phrase label="lu_Fax"/>:</strong>
-					</td> 
+					</td>
 					<td class="block-data">
 						<input type="text" name="<inp2:u_InputName field="Fax"/>" value="<inp2:u_Field name="Fax"/>" style="width: 150px;" />
 					</td>
 					<td width="170" class="error"><inp2:u_Error field="Fax"/></td>
 				</tr>
 
-				<tr> 
+				<tr>
 					<td class="block-data">
 						<strong><inp2:m_Phrase label="lu_comm_BirthDate"/> *:</strong><br>
-					</td> 
+					</td>
 					<td class="block-data">
 						<script src="inc/calendar.js"></script>
 						<input type="text" name="<inp2:u_InputName field="dob_date"/>" id="<inp2:u_InputName field="dob_date"/>" value="<inp2:u_Field name="dob_date" format="_regional_InputDateFormat"/>" style="width: 100px;" datepickerIcon="img/calendar.gif"/>
@@ -112,46 +112,46 @@
 					</td>
 					<td width="170" class="error"><inp2:u_Error field="dob_date"/></td>
 				</tr>
-					
-				<tr> 
+
+				<tr>
 					<td class="block-data">
 						<strong><inp2:m_Phrase label="lu_Email"/> *:</strong>
-					</td> 
+					</td>
 					<td class="block-data">
 						<input type="text" name="<inp2:u_InputName field="Email"/>" value="<inp2:u_Field field="Email"/>" style="width: 200px;" />
 					</td>
 					<td width="170" class="error"><inp2:u_Error field="Email"/></td>
-				</tr>	
-						
-				<tr> 
+				</tr>
+
+				<tr>
 					<td class="block-data">
 						<strong><inp2:m_Phrase label="lu_comm_AddressLine"/> 1:</strong>
-					</td> 
+					</td>
 					<td class="block-data">
 						<input type="text" name="<inp2:u_InputName field="Street"/>" value="<inp2:u_Field name="Street"/>" style="width: 300px;" />
 					</td>
 					<td width="170" class="error"><inp2:u_Error field="Street"/></td>
 				</tr>
-				
-				<tr> 
+
+				<tr>
 					<td class="block-data">
 						<strong><inp2:m_Phrase label="lu_comm_AddressLine"/> 2:</strong>
-					</td> 
+					</td>
 					<td class="block-data">
 						<input type="text" name="<inp2:u_InputName field="Street2"/>" value="<inp2:u_Field name="Street2"/>" style="width: 300px;" />
 					</td>
 					<td width="170" class="error"><inp2:u_Error field="Street2"/></td>
 				</tr>
-					
-				<tr> 
+
+				<tr>
 					<td class="block-data">
 						<strong><inp2:m_Phrase label="lu_City"/>:</strong>
-					</td> 
+					</td>
 					<td class="block-data">
 						<input type="text" name="<inp2:u_InputName field="City"/>" value="<inp2:u_Field name="City"/>" style="width: 100px;" />
 					</td>
 					<td width="170" class="error"><inp2:u_Error field="City"/></td>
-				</tr>	
+				</tr>
 				<tr>
 					<td>
 						<strong><inp2:m_phrase label="lu_state"/>:</strong></td>
@@ -160,22 +160,21 @@
 					</td>
 					<td class="error"><inp2:u_Error field="State"/></td>
 				</tr>
-				<tr> 
+				<tr>
 					<td class="block-data">
 						<strong><inp2:m_Phrase label="lu_comm_ZipCode"/>:</strong>
-					</td> 
+					</td>
 					<td class="block-data">
 						<input type="text" name="<inp2:u_InputName field="Zip"/>" value="<inp2:u_Field name="Zip"/>" style="width: 60px;" />
 					</td>
 					<td width="170" class="error"><inp2:u_Error field="Zip"/></td>
-				</tr>	
+				</tr>
 				<tr>
 					<td>
 						<strong><inp2:m_phrase label="lu_country"/>:</strong></td>
 					<td>
 						<select name="<inp2:u_InputName field="Country"/>" style="width: 300px;">
-							<option value=""></option>
-							<inp2:u_PredefinedOptions field="Country" render_as="destination" selected_param="selected" selected="selected=\"selected\""/>
+							<inp2:u_PredefinedOptions field="Country" render_as="destination" has_empty="1" selected_param="selected" selected="selected=\"selected\""/>
 						</select>
 					</td>
 					<td class="error"><inp2:u_Error field="Country"/></td>
@@ -185,10 +184,10 @@
 						<input class="button" type="submit" id="events[u][OnUpdate]" name="events[u][OnUpdate]" value="<inp2:m_Phrase label="lu_comm_Update" no_editing="1"/>"/>
 						<input type="hidden" name="next_template" value="in-commerce/my_account/account"/>
 					</td>
-				</tr>	
+				</tr>
 			</table>
 		</td>
 	</tr>
-	
+
 </table>
 </form>
\ No newline at end of file
Index: branches/1.1.x/in-commerce/blocks/checkout/shipping_address.tpl
===================================================================
diff -u -r13091 -r13469
--- branches/1.1.x/in-commerce/blocks/checkout/shipping_address.tpl	(.../shipping_address.tpl)	(revision 13091)
+++ branches/1.1.x/in-commerce/blocks/checkout/shipping_address.tpl	(.../shipping_address.tpl)	(revision 13469)
@@ -114,8 +114,7 @@
 								<strong><inp2:m_Phrase label="lu_Country"/> *:</strong></td>
 							<td>
 								<select name="<inp2:ord_InputName field="ShippingCountry"/>" style="width: 300px;">
-										<option value=""></option>
-										<inp2:ord_PredefinedOptions field="ShippingCountry" render_as="destination" selected_param="selected" selected="selected=\"selected\""/>
+									<inp2:ord_PredefinedOptions field="ShippingCountry" render_as="destination" has_empty="1" selected_param="selected" selected="selected=\"selected\""/>
 								</select>
 							</td>
 							<td class="error"><inp2:ord_Error field="ShippingCountry"/></td>
Index: branches/1.1.x/in-commerce/blocks/checkout/form_register.tpl
===================================================================
diff -u -r13091 -r13469
--- branches/1.1.x/in-commerce/blocks/checkout/form_register.tpl	(.../form_register.tpl)	(revision 13091)
+++ branches/1.1.x/in-commerce/blocks/checkout/form_register.tpl	(.../form_register.tpl)	(revision 13469)
@@ -4,7 +4,7 @@
 
 <inp2:m_if check="u_SuggestRegister">
 	<form method="post" action="<inp2:m_FormAction />">
-	
+
 	<table class="block-no-border">
 		<tr>
 			<td class="block-header">
@@ -68,11 +68,11 @@
 							</td>
 							<td class="error"><inp2:u_Error field="VerifyPassword"/></td>
 						</tr>
-					
-						<tr> 
+
+						<tr>
 							<td class="block-data">
 								<strong><inp2:m_phrase label="lu_birth_date"/>*:</strong><br>
-							</td> 
+							</td>
 							<td class="block-data">
 								<script src="inc/calendar.js"></script>
 								<input type="text" name="<inp2:u_InputName field="dob_date"/>" id="<inp2:u_InputName field="dob_date"/>" value="<inp2:u_Field name="dob_date" format="_regional_InputDateFormat"/>" style="width: 100px;" datepickerIcon="img/calendar.gif"/>
@@ -82,8 +82,8 @@
 								(<inp2:u_Format field="dob_date" input_format="1" human="true"/>, ex. <inp2:u_Format field="dob_date" sample="true"/>)
 							</td>
 							<td class="error"><inp2:u_Error field="dob_date"/></td>
-						</tr>	
-						
+						</tr>
+
 						<tr>
 							<td>
 								<strong><inp2:m_phrase label="lu_first_name"/>:</strong>
@@ -93,7 +93,7 @@
 							</td>
 							<td class="error"><inp2:u_Error field="FirstName"/></td>
 						</tr>
-						
+
 						<tr>
 							<td>
 								<strong><inp2:m_phrase label="lu_last_name"/>:</strong>
@@ -103,7 +103,7 @@
 							</td>
 							<td class="error"><inp2:u_Error field="LastName"/></td>
 						</tr>
-						
+
 						<tr>
 							<td>
 								<strong><inp2:m_phrase label="lu_company"/>:</strong>
@@ -113,7 +113,7 @@
 							</td>
 							<td class="error"><inp2:u_Error field="Company"/></td>
 						</tr>
-						
+
 						<tr>
 							<td>
 								<strong><inp2:m_phrase label="lu_address_line"/> 1:</strong>
@@ -123,7 +123,7 @@
 							</td>
 							<td class="error"><inp2:u_Error field="Street"/></td>
 						</tr>
-						
+
 						<tr>
 							<td>
 								<strong><inp2:m_phrase label="lu_address_line"/> 2:</strong>
@@ -133,7 +133,7 @@
 							</td>
 							<td class="error"><inp2:u_Error field="Street2"/></td>
 						</tr>
-						
+
 						<tr>
 							<td>
 								<strong><inp2:m_phrase label="lu_city"/>:</strong>
@@ -151,7 +151,7 @@
 								<input type="text" name="<inp2:u_InputName field="State"/>" value="<inp2:u_Field name="State"/>" style="width: 200px;" />
 							</td>
 							<td class="error"><inp2:u_Error field="State"/></td>
-						</tr>						
+						</tr>
 						<tr>
 							<td>
 								<strong><inp2:m_phrase label="lu_ZipCode"/>:</strong>
@@ -167,13 +167,12 @@
 							</td>
 							<td>
 								<select name="<inp2:u_InputName field="Country"/>" style="width: 300px;">
-									<option value=""></option>
-									<inp2:u_PredefinedOptions field="Country" render_as="destination" selected_param="selected" selected="selected=\"selected\""/>
+									<inp2:u_PredefinedOptions field="Country" render_as="destination" has_empty="1" selected_param="selected" selected="selected=\"selected\""/>
 								</select>
 							</td>
 							<td class="error"><inp2:u_Error field="Country"/></td>
 						</tr>
-						
+
 						<tr>
 							<td>
 								<strong><inp2:m_phrase label="lu_phone"/>:</strong>
@@ -183,7 +182,7 @@
 							</td>
 							<td class="error"><inp2:u_Error field="Phone"/></td>
 						</tr>
-						
+
 						<tr>
 							<td>
 								<strong><inp2:m_phrase label="lu_fax"/>:</strong>
@@ -193,22 +192,22 @@
 							</td>
 							<td class="error"><inp2:u_Error field="Fax"/></td>
 						</tr>
-						
+
 						<tr>
 							<td colspan="3" valign="bottom" height="35">
 								<input type="hidden" name="next_template" value="<inp2:m_get var="next_template"/>">
 								<input type="hidden" name="registration_confirm_template" value="platform/login/register_confirm">
 								<input type="hidden" name="registration_confirm_pending_template" value="platform/login/register_confirm_pending">
-								
+
 								<input type="hidden" name="fields_prefilled" value="1" />
-								
+
 								<input class="button" type="submit" id="events[u][OnCreate]" name="events[u][OnCreate]" value="<inp2:m_Phrase label="lu_Register" no_editing="1"/>"/>
 							</td>
 						</tr>
 					</table>
 			</td>
 		</tr>
 	</table>
-	
+
 	</form>
 </inp2:m_if>
\ No newline at end of file
Index: branches/1.1.x/in-commerce/blocks/checkout/billing_address.tpl
===================================================================
diff -u -r13091 -r13469
--- branches/1.1.x/in-commerce/blocks/checkout/billing_address.tpl	(.../billing_address.tpl)	(revision 13091)
+++ branches/1.1.x/in-commerce/blocks/checkout/billing_address.tpl	(.../billing_address.tpl)	(revision 13469)
@@ -128,8 +128,7 @@
 							<strong><inp2:m_Phrase label="lu_Country"/> *:</strong></td>
 						<td>
 							<select name="<inp2:ord_InputName field="BillingCountry"/>" style="width: 300px;">
-									<option value="0"></option>
-									<inp2:ord_PredefinedOptions field="BillingCountry" render_as="destination" selected_param="selected" selected="selected=\"selected\""/>
+								<inp2:ord_PredefinedOptions field="BillingCountry" render_as="destination" has_empty="1" selected_param="selected" selected="selected=\"selected\""/>
 							</select>
 						</td>
 						<td class="error"><inp2:ord_Error field="BillingCountry" /></td>