Index: lams_admin/web/organisation.jsp
===================================================================
diff -u -r6da91b1ff2dd9ac6d07f8a3b2dd3fbd8a63ecaaa -r7e620c99609751edad11e097c144bd46e2c94008
--- lams_admin/web/organisation.jsp	(.../organisation.jsp)	(revision 6da91b1ff2dd9ac6d07f8a3b2dd3fbd8a63ecaaa)
+++ lams_admin/web/organisation.jsp	(.../organisation.jsp)	(revision 7e620c99609751edad11e097c144bd46e2c94008)
@@ -50,21 +50,16 @@
 		<td><html-el:textarea property="description" cols="50" rows="3" /></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.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>