Index: advanced/_install/english.lang
===================================================================
--- advanced/_install/english.lang	(revision 14705)
+++ advanced/_install/english.lang	(working copy)
@@ -173,7 +173,6 @@
 			<PHRASE Label="lu_fld_Image1" Module="Core" Type="0">Mm5kIEltYWdl</PHRASE>
 			<PHRASE Label="lu_fld_Image2" Module="Core" Type="0">M3JkIEltYWdl</PHRASE>
 			<PHRASE Label="lu_fld_LastName" Module="Core" Type="0">TGFzdCBuYW1l</PHRASE>
-			<PHRASE Label="lu_fld_Login" Module="Core" Type="0">VXNlcm5hbWU=</PHRASE>
 			<PHRASE Label="lu_fld_module" Module="Core" Type="0">TW9kdWxl</PHRASE>
 			<PHRASE Label="lu_fld_MoreCategories" Module="Core" Type="0">QWRkaXRpb25hbCBDYXRlZ29yaWVz</PHRASE>
 			<PHRASE Label="lu_fld_Name" Module="Core" Type="0">TmFtZQ==</PHRASE>
@@ -196,6 +195,7 @@
 			<PHRASE Label="lu_fld_title" Module="Core" Type="0">VGl0bGU=</PHRASE>
 			<PHRASE Label="lu_fld_translation" Module="Core" Type="0">VHJhbnNsYXRpb24=</PHRASE>
 			<PHRASE Label="lu_fld_UserGroup" Module="Core" Type="0">TWVtYmVyc2hpcCBHcm91cA==</PHRASE>
+			<PHRASE Label="lu_fld_Username" Module="Core" Type="0">VXNlcm5hbWU=</PHRASE>
 			<PHRASE Label="lu_fld_VerifyPassword" Module="Core" Type="0">VmVyaWZ5IFBhc3N3b3Jk</PHRASE>
 			<PHRASE Label="lu_fld_version" Module="Core" Type="0">VmVyc2lvbg==</PHRASE>
 			<PHRASE Label="lu_fld_Zip" Module="Core" Type="0">WmlwIGNvZGU=</PHRASE>
Index: advanced/in-commerce/elements/content_boxes/checkout/form_register.elm.tpl
===================================================================
--- advanced/in-commerce/elements/content_boxes/checkout/form_register.elm.tpl	(revision 14705)
+++ advanced/in-commerce/elements/content_boxes/checkout/form_register.elm.tpl	(working copy)
@@ -5,49 +5,49 @@
 
 	<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
 
-	<inp2:ord_PrefillRegistrationFields type="billing"/>
-	<inp2:m_if check="u_HasError" field="any">
+	<inp2:u.register_FormName name="registration"/>
+	<inp2:ord_PrefillRegistrationFields user_prefix="u.register" type="billing"/>
+	<inp2:m_if check="u.register_HasError" field="any">
 		<inp2:m_RenderElement name="error_message" />
 	</inp2:m_if>
 
-	<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_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_RenderElement name="inp_edit_box" prefix="u.register" field="Username" title="lu_fld_Login" style="width:155px" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Email" title="lu_fld_Email" style="width:155px" />
 
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Email" title="lu_fld_Email" style="width:155px" />
-
 			<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" />
-				<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword" title="lu_fld_VerifyPassword" style="width:155px" />
+				<inp2:m_RenderElement name="inp_edit_password" prefix="u.register" field="Password" title="lu_fld_Password" style="width:155px" />
+				<inp2:m_RenderElement name="inp_edit_password" prefix="u.register" field="VerifyPassword" title="lu_fld_VerifyPassword" style="width:155px" />
 			</inp2:m_if>
 
-			<inp2:m_RenderElement name="inp_edit_date" prefix="u" field="dob" title="lu_fld_BirthDate" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="FirstName" title="lu_fld_FirstName" style="width:155px" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="LastName" title="lu_fld_LastName" style="width:155px" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Company" title="lu_fld_Company" style="width:155px" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street" title="lu_fld_AddressLine1" style="width:155px" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street2" title="lu_fld_AddressLine2" style="width:155px" />
-			<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" has_empty="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Phone" title="lu_fld_Phone" style="width:155px" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Fax" title="lu_fld_Fax" style="width:155px" is_last="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="FirstName" title="lu_fld_FirstName" style="width:155px" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="LastName" title="lu_fld_LastName" style="width:155px" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Company" title="lu_fld_Company" style="width:155px" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Phone" title="lu_fld_Phone" style="width:155px" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Fax" title="lu_fld_Fax" style="width:155px"/>
 
+			<inp2:m_RenderElement name="inp_edit_date" prefix="u.register" field="dob" title="lu_fld_BirthDate" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Street" title="lu_fld_AddressLine1" style="width:155px" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Street2" title="lu_fld_AddressLine2" style="width:155px" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="City" title="lu_fld_City" style="width:155px" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="State" title="lu_fld_State" style="width:155px" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Zip" title="lu_fld_Zip" style="width:55px" />
+			<inp2:m_RenderElement name="inp_edit_options" prefix="u.register" field="Country" title="lu_fld_Country" has_empty="1" is_last="1"/>
+			
+
 			<inp2:m_RenderElement design="inp_edit_buttons">
-				<input type="hidden" name="next_template" value="<inp2:m_get var="next_template"/>">
+				<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_btn_Register" no_editing="1"/>"/>
+				<input class="button" type="submit" id="events[u.register][OnCreate]" name="events[u.register][OnCreate]" value="<inp2:m_Phrase label="lu_btn_Register" no_editing="1"/>"/>
 				<input type="hidden" name="cancel_template" value="in-commerce/checkout/shop_cart" />
-				<input type="submit" class="button" name="events[ls][OnCancel]" value="<inp2:m_Phrase label="lu_btn_Cancel" />" no_editing="1"/>
+				<input type="submit" class="button" name="events[u.register][OnCancel]" value="<inp2:m_Phrase label="lu_btn_Cancel" />" no_editing="1"/>
 			</inp2:m_RenderElement>
 		</table>
 	</form>
Index: advanced/platform/elements/users.elm.tpl
===================================================================
--- advanced/platform/elements/users.elm.tpl	(revision 14705)
+++ advanced/platform/elements/users.elm.tpl	(working copy)
@@ -9,7 +9,7 @@
 	</tr>
 	<tr class="listing-row">
 		<td valign="top">
-			<a href="<inp2:ProfileLink template="platform/my_account/public_profile"/>"><inp2:Field name="Login"/></a>
+			<a href="<inp2:ProfileLink template="platform/my_account/public_profile"/>"><inp2:Field name="Username"/></a>
 		</td>
 		<td valign="top">
 			<inp2:m_if check="LoggedIn">
Index: advanced/platform/login/forgot_password.tpl
===================================================================
--- advanced/platform/login/forgot_password.tpl	(revision 14705)
+++ advanced/platform/login/forgot_password.tpl	(working copy)
@@ -60,7 +60,7 @@
 				<form method="post" action="<inp2:m_FormAction/>">
 					<table class="form-data fullwidth">
 						<inp2:m_if check="u_UseUsernames">
-							<inp2:m_RenderElement name="inp_edit_box" prefix="u.forgot" field="ForgotLogin" title="lu_fld_Login" style="width: 155px;"/>
+							<inp2:m_RenderElement name="inp_edit_box" prefix="u.forgot" field="ForgotLogin" title="lu_fld_Username" style="width: 155px;"/>
 
 							<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 								<td class="field-name"></td>
Index: advanced/platform/login/register.tpl
===================================================================
--- advanced/platform/login/register.tpl	(revision 14705)
+++ advanced/platform/login/register.tpl	(working copy)
@@ -56,9 +56,7 @@
 
 				<form method="post" action="<inp2:m_FormAction/>">
 					<table class="form-data fullwidth">
-						<inp2:m_if check="u.register_UseUsernames">
-							<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Login" title="lu_fld_Login" style="width:155px" />
-						</inp2:m_if>
+						<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Username" title="lu_fld_Username" style="width:155px" />
 
 						<inp2:m_if check="m_ConfigEquals" name="User_Password_Auto" value="0">
 							<inp2:m_RenderElement name="inp_edit_password" prefix="u.register" field="Password" title="lu_fld_Password" style="width:155px" />
@@ -82,9 +80,9 @@
 						<inp2:m_if check="m_GetConfig" name="AllowSelectGroupOnFront">
 							<inp2:m_RenderElement name="inp_edit_options" prefix="u.register" field="PrimaryGroupId" title="lu_fld_UserGroup" />
 						</inp2:m_if>
-						
+
 						<inp2:m_RenderElement name="inp_edit_checkbox" prefix="u.register" field="SubscribeToMailing" title="lu_fld_SubscribeToMailing" is_last="1"/>
-						
+
 						<inp2:m_if check="m_ConfigEquals" option="RegistrationCaptcha" value="1">
 							<inp2:m_RenderElement name="inp_edit_field_separator" is_last="0"/>
 							<inp2:m_RenderElement name="inp_edit_captcha" prefix="u.register" style="width: 170px;" />
Index: advanced/platform/my_account/my_preferences.tpl
===================================================================
--- advanced/platform/my_account/my_preferences.tpl	(revision 14705)
+++ advanced/platform/my_account/my_preferences.tpl	(working copy)
@@ -70,8 +70,8 @@
 						</tr>
 
 						<tr>
-							<td class="field-name"><inp2:m_phrase name="lu_fld_Login"/></td>
-							<td><inp2:u_Field field="Login"/></td>
+							<td class="field-name"><inp2:m_phrase name="lu_fld_Username"/></td>
+							<td><inp2:u_Field field="Username"/></td>
 							<td class="field-value">&nbsp;</td>
 						</tr>
 
Index: advanced/platform/my_account/my_profile.tpl
===================================================================
--- advanced/platform/my_account/my_profile.tpl	(revision 14705)
+++ advanced/platform/my_account/my_profile.tpl	(working copy)
@@ -49,9 +49,9 @@
 				<form method="post" enctype="multipart/form-data" action="<inp2:m_FormAction/>">
 					<table class="form-data fullwidth">
 						<inp2:m_if check="u_Field" name="OldStyleLogin" db="db">
-							<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="lu_fld_Login" style="width:155px"/>
+							<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Username" title="lu_fld_Username" style="width:155px"/>
 						<inp2:m_else/>
-							<inp2:m_RenderElement name="inp_label" prefix="u" field="Login" title="lu_fld_Login"/>
+							<inp2:m_RenderElement name="inp_label" prefix="u" field="Username" title="lu_fld_Username"/>
 						</inp2:m_if>
 
 						<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="lu_fld_Password" style="width:155px" />
Index: advanced/platform/my_account/public_profile.tpl
===================================================================
--- advanced/platform/my_account/public_profile.tpl	(revision 14705)
+++ advanced/platform/my_account/public_profile.tpl	(working copy)
@@ -45,8 +45,8 @@
 
 				<table class="form-data fullwidth">
 					<tr>
-						<td class="field-name"><inp2:m_phrase name="lu_fld_Login"/></td>
-						<td class="field-value"><inp2:u.profile_Field field="Login"/></td>
+						<td class="field-name"><inp2:m_phrase name="lu_fld_Username"/></td>
+						<td class="field-value"><inp2:u.profile_Field field="Username"/></td>
 					</tr>
 
 					<inp2:m_if check="user-profile_ProfileFieldCount">