Index: branches/1.0.x/elements/ajax/register.tpl
===================================================================
diff -u -N -r14794 -r14805
--- branches/1.0.x/elements/ajax/register.tpl	(.../register.tpl)	(revision 14794)
+++ branches/1.0.x/elements/ajax/register.tpl	(.../register.tpl)	(revision 14805)
@@ -26,12 +26,13 @@
 
 		<div class="halfcol halfcol-last">
 			<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_options" prefix="u.register" field="Country" has_empty="1" empty_label="lu_opt_SelectCountry"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="u.register" field="State" has_empty="1"/>
 
 			<!-- TODO: preload states by country -->
-
+			<inp2:m_RenderElement name="inp_edit_options" 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"/>
 		</div>
 		<div class="clear"></div>