Index: lams_central/web/editprofile.jsp
===================================================================
diff -u -r240dba20019d989674d17faa11ce3c4feec48b9b -r9b9a8c320a611027445fe94db5cd458c2968700d
--- lams_central/web/editprofile.jsp	(.../editprofile.jsp)	(revision 240dba20019d989674d17faa11ce3c4feec48b9b)
+++ lams_central/web/editprofile.jsp	(.../editprofile.jsp)	(revision 9b9a8c320a611027445fe94db5cd458c2968700d)
@@ -93,6 +93,18 @@
 		<td class="align-right"><fmt:message key="label.fax"/>:</td>
 		<td><html:text property="fax" size="50" maxlength="64" /></td>
 	</tr>
+	<tr>
+		<td class="align-right"><fmt:message key="label.language"/>:</td>
+		<td>
+			<html:select property="localeId">
+				<c:forEach items="${locales}" var="locale">
+					<html:option value="${locale.localeId}">
+						<c:out value="${locale.description}" />
+					</html:option>
+				</c:forEach>	
+			</html:select>
+		</td>
+	</tr>
 	
 </c:if>
 
@@ -178,21 +190,21 @@
 		<td class="align-right"><fmt:message key="label.fax"/>:</td>
 		<td><bean:write name="UserForm" property="fax" /></td>
 	</tr>
-	
-</c:if>
-	
 	<tr>
 		<td class="align-right"><fmt:message key="label.language"/>:</td>
 		<td>
-			<html:select property="localeId">
-				<c:forEach items="${locales}" var="locale">
-					<html:option value="${locale.localeId}">
-						<c:out value="${locale.description}" />
-					</html:option>
-				</c:forEach>	
-			</html:select>
+			<c:set var="localeId"><bean:write name="UserForm" property="localeId" /></c:set>
+			<c:forEach items="${locales}" var="locale">
+				<c:if test="${locale.localeId eq localeId}">
+					<c:out value="${locale.description}" />
+				</c:if>
+			</c:forEach>
 		</td>
 	</tr>
+	
+</c:if>
+	
+	
 	</table>
 			</div>