Index: lams_admin/web/user.jsp
===================================================================
diff -u -r0b5b99ca4e4f6d595380e2eb2cbd0b8cc146e910 -r94ffcde3b0dea448380b67d34a779ce1ef021e3a
--- lams_admin/web/user.jsp	(.../user.jsp)	(revision 0b5b99ca4e4f6d595380e2eb2cbd0b8cc146e910)
+++ lams_admin/web/user.jsp	(.../user.jsp)	(revision 94ffcde3b0dea448380b67d34a779ce1ef021e3a)
@@ -97,24 +97,19 @@
 	<tr>
 		<td><fmt:message key="admin.organisation.language"/>:</td>
 		<td>
-			<html-el:select property="localeLanguage">
-				<c:forEach items="${languages}" var="language">
-					<html-el:option value="${language.isoCode}"><fmt:message key="locale.language.${language.isoCode}"/></html-el:option>
+			<html-el:select property="localeId">
+				<c:forEach items="${locales}" var="locale">
+					<html-el:option value="${locale.localeId}">
+						<fmt:message key="locale.language.${locale.languageIsoCode}"/>
+						<c:if test="${!empty locale.countryIsoCode}">
+							&nbsp;(<fmt:message key="locale.country.${locale.countryIsoCode}"/>)
+						</c:if>
+					</html-el:option>
 				</c:forEach>	
 			</html-el:select>
 		</td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.organisation.country"/>:</td>
-		<td>
-			<html-el:select property="localeCountry">
-				<c:forEach items="${countries}" var="country">
-					<html-el:option value="${country.isoCode}"><fmt:message key="locale.country.${country.isoCode}"/></html-el:option>
-				</c:forEach>
-			</html-el:select>
-		</td>
-	</tr>
-	<tr>
 	    <td><fmt:message key="admin.user.roles"/>:</td>
 	    <td>
             <c:forEach items="${rolelist}" var="role">