Index: trunk/themes/default2007/platform/login/register.tpl
===================================================================
diff -u -N -r8693 -r8759
--- trunk/themes/default2007/platform/login/register.tpl	(.../register.tpl)	(revision 8693)
+++ trunk/themes/default2007/platform/login/register.tpl	(.../register.tpl)	(revision 8759)
@@ -7,24 +7,28 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<!-- phrases -->
+	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_UserRegistration" templates="platform/login/register"/>
+
+	<!-- user registration -->
 	<inp2:m_RenderElement design="content_box">
 		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_UserRegistration"/>
 		</inp2:m_Capture>
 
 		<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
 
+		<inp2:u_PresetFormFields/>
 		<inp2:m_if check="u_HasError" field="any">
 			<inp2:m_RenderElement name="error_message" />
 		</inp2:m_if>
 
-		<inp2:u_PresetFormFields/>
-		<form method="post" action="<inp2:m_FormAction/>">
+		<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
 
-			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
+		<form method="post" action="<inp2:m_FormAction/>">
 			<table class="form-data fullwidth">
-				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="lu_fld_Login" style="width:155px" />
+				<inp2:m_if check="u_UseUsernames">
+					<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="lu_fld_Login" style="width:155px" />
+				</inp2:m_if>
 
 				<inp2:m_if check="m_ConfigEquals" name="User_Password_Auto" value="0">
 					<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="lu_fld_Password" style="width:155px" />
@@ -43,16 +47,15 @@
 				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="City" title="lu_fld_City" style="width:155px" />
 				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="State" title="lu_fld_State" style="width:155px" />
 				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Zip" title="lu_fld_Zip" style="width:55px" />
-				<inp2:m_RenderElement name="inp_edit_options" prefix="u" field="Country" title="lu_fld_Country" />
+				<inp2:m_RenderElement name="inp_edit_options" prefix="u" field="Country" title="lu_fld_Country" is_last="1"/>
 
-
 				<tr>
 					<td colspan="2">
 						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" />
 					</td>
 				</tr>
 				<tr>
-					<td style="width:140px">
+					<td style="width: 140px;">
 						&nbsp;
 					</td>
 					<td>
@@ -69,8 +72,7 @@
 			</table>
 		</form>
 	</inp2:m_RenderElement>
-
-	<!-- // phrases -->
+	<!-- // user registration -->
 </inp2:m_DefineElement>
 
 <inp2:m_include template="platform/designs/default_design" pass_params="1"/>
\ No newline at end of file