Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgSaveAction.java
===================================================================
diff -u -r8a4d69bf6159f6bcd910eb930d77016e255619e9 -r7e620c99609751edad11e097c144bd46e2c94008
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgSaveAction.java	(.../OrgSaveAction.java)	(revision 8a4d69bf6159f6bcd910eb930d77016e255619e9)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgSaveAction.java	(.../OrgSaveAction.java)	(revision 7e620c99609751edad11e097c144bd46e2c94008)
@@ -40,6 +40,7 @@
 import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.OrganisationState;
 import org.lamsfoundation.lams.usermanagement.OrganisationType;
+import org.lamsfoundation.lams.usermanagement.SupportedLocale;
 import org.lamsfoundation.lams.usermanagement.Workspace;
 import org.lamsfoundation.lams.usermanagement.WorkspaceFolder;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
@@ -109,13 +110,18 @@
 
 			HttpSession ss = SessionManager.getSession();
 			UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+			SupportedLocale locale = (SupportedLocale)service.findById(SupportedLocale.class,(Byte)orgForm.get("localeId"));
 
 			if(orgId!=0){
 				org = (Organisation)service.findById(Organisation.class,orgId);
 				BeanUtils.copyProperties(org,orgForm);
+				org.setLocaleCountry(locale.getCountryIsoCode());
+				org.setLocaleLanguage(locale.getLanguageIsoCode());
 			}else{
 				org = new Organisation();
 				BeanUtils.copyProperties(org,orgForm);
+				org.setLocaleCountry(locale.getCountryIsoCode());
+				org.setLocaleLanguage(locale.getLanguageIsoCode());
 				org.setParentOrganisation((Organisation)service.findById(Organisation.class,(Integer)orgForm.get("parentId")));
 				org.setOrganisationType((OrganisationType)service.findById(OrganisationType.class,(Integer)orgForm.get("typeId")));
 			}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java
===================================================================
diff -u -r2bd7f539aabef95e1a01e41be46e6bb317595287 -r7e620c99609751edad11e097c144bd46e2c94008
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java	(.../OrganisationAction.java)	(revision 2bd7f539aabef95e1a01e41be46e6bb317595287)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java	(.../OrganisationAction.java)	(revision 7e620c99609751edad11e097c144bd46e2c94008)
@@ -23,7 +23,10 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.admin.web;
 
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -34,10 +37,9 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.DynaActionForm;
-import org.lamsfoundation.lams.usermanagement.Country;
-import org.lamsfoundation.lams.usermanagement.Language;
 import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.OrganisationState;
+import org.lamsfoundation.lams.usermanagement.SupportedLocale;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
@@ -68,11 +70,15 @@
 	private static IUserManagementService service = (IUserManagementService) ctx
 			.getBean("userManagementServiceTarget");
 
-	private static List countries = service.findAll(Country.class);
+	//private static List countries = service.findAll(Country.class);
 	
-	private static List languages = service.findAll(Language.class);
+	private static List<SupportedLocale> locales = service.findAll(SupportedLocale.class);
 	
 	private static List status = service.findAll(OrganisationState.class);
+	
+	static{
+		Collections.sort(locales);
+	}
 
 	public ActionForward edit(ActionMapping mapping, ActionForm form,HttpServletRequest request, HttpServletResponse response) throws Exception{
 		Integer orgId = WebUtil.readIntParam(request,"orgId",true);
@@ -85,9 +91,16 @@
 			orgForm.set("parentName",org.getParentOrganisation().getName());
 			orgForm.set("typeId",org.getOrganisationType().getOrganisationTypeId());
 			orgForm.set("stateId",org.getOrganisationState().getOrganisationStateId());
+			Map<String, Object> properties = new HashMap<String, Object>();
+			properties.put("languageIsoCode",org.getLocaleLanguage());
+			if(org.getLocaleCountry()!=null){
+				properties.put("countryIsoCode",org.getLocaleCountry());
+			}
+			SupportedLocale locale = (SupportedLocale)service.findByProperties(SupportedLocale.class,properties).get(0);
+			orgForm.set("localeId",locale.getLocaleId());
 		}
-		request.getSession().setAttribute("countries",countries);
-		request.getSession().setAttribute("languages",languages);
+		//request.getSession().setAttribute("countries",countries);
+		request.getSession().setAttribute("locales",locales);
 		request.getSession().setAttribute("status",status);
 		return mapping.findForward("organisation");
 	}
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>
Index: lams_admin/web/orglist.jsp
===================================================================
diff -u -r6da91b1ff2dd9ac6d07f8a3b2dd3fbd8a63ecaaa -r7e620c99609751edad11e097c144bd46e2c94008
--- lams_admin/web/orglist.jsp	(.../orglist.jsp)	(revision 6da91b1ff2dd9ac6d07f8a3b2dd3fbd8a63ecaaa)
+++ lams_admin/web/orglist.jsp	(.../orglist.jsp)	(revision 7e620c99609751edad11e097c144bd46e2c94008)
@@ -54,7 +54,9 @@
 			<fmt:message key="locale.language.${orgManageBean.localeLanguage}"/>
 		</td>
 		<td>
-			<fmt:message key="locale.country.${orgManageBean.localeCountry}"/>
+			<c:if test="${!empty orgManageBean.localeCountry}">
+				<fmt:message key="locale.country.${orgManageBean.localeCountry}"/>
+			</c:if>
 		</td>
 		<td>
 			<fmt:message key="organisation.state.${orgManageBean.status}"/>