Index: lams_admin/web/user.jsp
===================================================================
diff -u -r54ff12d78b5d617bc7767b37faea406d5675a746 -rd1d4b9a5af1887e382f087d7c8f858f0f7983bdc
--- lams_admin/web/user.jsp	(.../user.jsp)	(revision 54ff12d78b5d617bc7767b37faea406d5675a746)
+++ lams_admin/web/user.jsp	(.../user.jsp)	(revision d1d4b9a5af1887e382f087d7c8f858f0f7983bdc)
@@ -20,81 +20,80 @@
 
 <div align="center"><html-el:errors/></div>
 <table>
-  <col align="right" /><col align="left" />
 	<tr>
-		<td><fmt:message key="admin.user.login"/> *:</td>
+		<td align="right"><fmt:message key="admin.user.login"/> *:</td>
 		<td><html-el:text property="login" size="20" maxlength="20" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.user.password"/> *:</td>
+		<td align="right"><fmt:message key="admin.user.password"/> *:</td>
 		<td><html-el:password property="password" size="20" maxlength="50" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.user.password.confirm"/> *:</td>
+		<td align="right"><fmt:message key="admin.user.password.confirm"/> *:</td>
 		<td><html-el:password property="password2" size="20" maxlength="50" /></td>
 	</tr>
 	<tr>
-	<td><fmt:message key="admin.user.title"/>:</td>
+		<td align="right"><fmt:message key="admin.user.title"/>:</td>
 		<td><html-el:text property="title" size="20" maxlength="32" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.user.first_name"/>:</td>
+		<td align="right"><fmt:message key="admin.user.first_name"/> *:</td>
 		<td><html-el:text property="firstName" size="20" maxlength="64" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.user.last_name"/>:</td>
+		<td align="right"><fmt:message key="admin.user.last_name"/> *:</td>
 		<td><html-el:text property="lastName" size="20" maxlength="128" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.user.address_line_1"/>:</td>
+		<td align="right"><fmt:message key="admin.user.email"/> *:</td>
+		<td><html-el:text property="email" size="20" maxlength="128" /></td>
+	</tr>
+	<tr>
+		<td align="right"><fmt:message key="admin.user.address_line_1"/>:</td>
 		<td><html-el:text property="addressLine1" size="20" maxlength="64" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.user.address_line_2"/>:</td>
+		<td align="right"><fmt:message key="admin.user.address_line_2"/>:</td>
 		<td><html-el:text property="addressLine2" size="20" maxlength="64" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.user.address_line_3"/>:</td>
+		<td align="right"><fmt:message key="admin.user.address_line_3"/>:</td>
 		<td><html-el:text property="addressLine3" size="20" maxlength="64" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.user.city"/>:</td>
+		<td align="right"><fmt:message key="admin.user.city"/>:</td>
 		<td><html-el:text property="city" size="20" maxlength="64" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.user.postcode"/>:</td>
+		<td align="right"><fmt:message key="admin.user.postcode"/>:</td>
 		<td><html-el:text property="postcode" size="20" maxlength="10" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.user.state"/>:</td>
+		<td align="right"><fmt:message key="admin.user.state"/>:</td>
 		<td><html-el:text property="state" size="20" maxlength="64" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.user.country"/>:</td>
+		<td align="right"><fmt:message key="admin.user.country"/>:</td>
 		<td><html-el:text property="country" size="20" maxlength="64" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.user.day_phone"/>:</td>
+		<td align="right"><fmt:message key="admin.user.day_phone"/>:</td>
 		<td><html-el:text property="dayPhone" size="20" maxlength="64" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.user.evening_phone"/>:</td>
+		<td align="right"><fmt:message key="admin.user.evening_phone"/>:</td>
 		<td><html-el:text property="eveningPhone" size="20" maxlength="64" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.user.mobile_phone"/>:</td>
+		<td align="right"><fmt:message key="admin.user.mobile_phone"/>:</td>
 		<td><html-el:text property="mobilePhone" size="20" maxlength="64" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.user.fax"/>:</td>
+		<td align="right"><fmt:message key="admin.user.fax"/>:</td>
 		<td><html-el:text property="fax" size="20" maxlength="64" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.user.email"/>:</td>
-		<td><html-el:text property="email" size="20" maxlength="128" /></td>
-	</tr>
-	<tr>
-		<td><fmt:message key="admin.organisation.locale"/>:</td>
+		<td align="right"><fmt:message key="admin.organisation.locale"/>:</td>
 		<td>
 			<html-el:select property="localeId">
 				<c:forEach items="${locales}" var="locale">