diff --git a/DNN Platform/Website/controls/user.ascx b/DNN Platform/Website/controls/user.ascx
index 5c727b00300..7684a09e9db 100644
--- a/DNN Platform/Website/controls/user.ascx	
+++ b/DNN Platform/Website/controls/user.ascx	
@@ -19,12 +19,22 @@
 				maxlength="50"></asp:textbox>&nbsp;*
 			<asp:requiredfieldvalidator id="valLastName" runat="server" cssclass="NormalRed" display="Dynamic" errormessage="<br>Last Name Is Required."
 				controltovalidate="txtLastName" resourcekey="valLastName"></asp:requiredfieldvalidator></td>
+	</tr>	
+	<tr>
+		<td class="SubHead" width="175">
+			<dnn:label id="plEmail" runat="server" controlname="txtEmail" text="Email Address:"></dnn:label></td>
+		<td class="NormalBold" noWrap>
+			<asp:textbox id="txtEmail" tabIndex="3" runat="server" cssclass="NormalTextBox" size="25" maxlength="175"></asp:textbox>&nbsp;*
+			<asp:requiredfieldvalidator id="valEmail1" runat="server" cssclass="NormalRed" display="Dynamic" errormessage="<br>Email Is Required."
+				controltovalidate="txtEmail" resourcekey="valEmail1"></asp:requiredfieldvalidator>
+			<asp:regularexpressionvalidator id="valEmail2" runat="server" cssclass="NormalRed" display="Dynamic" errormessage="<br>Email Must be Valid."
+				controltovalidate="txtEmail" resourcekey="valEmail2" validationexpression="[\w\.-]+(\+[\w-]*)?@([\w-]+\.)+[\w-]+"></asp:regularexpressionvalidator></td>
 	</tr>
 	<tr>
 		<td class="SubHead" width="175">
 			<dnn:label id="plUserName" runat="server" controlname="txtUsername" text="User Name:"></dnn:label></td>
 		<td class="NormalBold" noWrap>
-			<asp:textbox id="txtUsername" tabIndex="3" runat="server" cssclass="NormalTextBox" size="25"
+			<asp:textbox id="txtUsername" tabIndex="4" runat="server" cssclass="NormalTextBox" size="25"
 				maxlength="175"></asp:textbox>
 			<asp:label id="lblUsernameAsterisk" runat="server">*</asp:label>
 			<asp:label id="lblUsername" runat="server"></asp:label>
@@ -35,7 +45,7 @@
 		<td class="SubHead" width="175">
 			<dnn:label id="plPassword" runat="server" controlname="txtPassword" text="Password:"></dnn:label></td>
 		<td class="NormalBold" noWrap>
-			<asp:textbox id="txtPassword" tabIndex="4" runat="server" cssclass="NormalTextBox" size="25"
+			<asp:textbox id="txtPassword" tabIndex="5" runat="server" cssclass="NormalTextBox" size="25"
 				maxlength="20" textmode="Password"></asp:textbox>&nbsp;*
 			<asp:requiredfieldvalidator id="valPassword" runat="server" cssclass="NormalRed" display="Dynamic" errormessage="<br>Password Is Required."
 				controltovalidate="txtPassword" resourcekey="valPassword"></asp:requiredfieldvalidator></td>
@@ -44,23 +54,13 @@
 		<td class="SubHead" width="175">
 			<dnn:label id="plConfirm" runat="server" controlname="txtConfirm" text="Confirm:"></dnn:label></td>
 		<td class="NormalBold" noWrap>
-			<asp:textbox id="txtConfirm" tabIndex="5" runat="server" cssclass="NormalTextBox" size="25" maxlength="20"
+			<asp:textbox id="txtConfirm" tabIndex="6" runat="server" cssclass="NormalTextBox" size="25" maxlength="20"
 				textmode="Password"></asp:textbox>&nbsp;*
 			<asp:requiredfieldvalidator id="valConfirm1" runat="server" cssclass="NormalRed" display="Dynamic" errormessage="<br>Password Confirmation Is Required."
 				controltovalidate="txtConfirm" resourcekey="valConfirm1"></asp:requiredfieldvalidator>
 			<asp:comparevalidator id="valConfirm2" runat="server" cssclass="NormalRed" display="Dynamic" errormessage="<br>Password Values Entered Do Not Match."
 				controltovalidate="txtConfirm" resourcekey="valConfirm2" controltocompare="txtPassword"></asp:comparevalidator></td>
 	</tr>
-	<tr>
-		<td class="SubHead" width="175">
-			<dnn:label id="plEmail" runat="server" controlname="txtEmail" text="Email Address:"></dnn:label></td>
-		<td class="NormalBold" noWrap>
-			<asp:textbox id="txtEmail" tabIndex="6" runat="server" cssclass="NormalTextBox" size="25" maxlength="175"></asp:textbox>&nbsp;*
-			<asp:requiredfieldvalidator id="valEmail1" runat="server" cssclass="NormalRed" display="Dynamic" errormessage="<br>Email Is Required."
-				controltovalidate="txtEmail" resourcekey="valEmail1"></asp:requiredfieldvalidator>
-			<asp:regularexpressionvalidator id="valEmail2" runat="server" cssclass="NormalRed" display="Dynamic" errormessage="<br>Email Must be Valid."
-				controltovalidate="txtEmail" resourcekey="valEmail2" validationexpression="[\w\.-]+(\+[\w-]*)?@([\w-]+\.)+[\w-]+"></asp:regularexpressionvalidator></td>
-	</tr>
 	<tr>
 		<td class="SubHead" width="175">
 			<dnn:label id="plWebsite" runat="server" controlname="txtWebsite" text="Website:"></dnn:label></td>