Index: lams_admin/web/user.jsp
===================================================================
diff -u -ra23376f298830f9cb4d3d18e5dc7ef11b907c173 -r862d181bb03e2bbaaf0a9e98c3877a0aff84fdf9
--- lams_admin/web/user.jsp	(.../user.jsp)	(revision a23376f298830f9cb4d3d18e5dc7ef11b907c173)
+++ lams_admin/web/user.jsp	(.../user.jsp)	(revision 862d181bb03e2bbaaf0a9e98c3877a0aff84fdf9)
@@ -1,4 +1,5 @@
 <%@ include file="/taglibs.jsp"%>
+<%@ page import="org.lamsfoundation.lams.util.Configuration" import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
 
 <html-el:form action="/usersave.do" method="post">
 <html-el:hidden property="userId" />
@@ -118,6 +119,24 @@
 					<td class="align-right"><fmt:message key="admin.user.fax"/>:</td>
 					<td><html-el:text property="fax" size="50" maxlength="64" /></td>
 				</tr>
+				
+				<c:set var="serverFlashEnabled"><%=Configuration.get(ConfigurationKeys.FLASH_ENABLE)%></c:set>
+				<c:choose>
+					<c:when test="${serverFlashEnabled}"> 
+						<tr>
+							<td class="align-right"><fmt:message key="admin.user.enable.flash.for.learner.window"/>:</td>
+							<td><html:select property="enableFlash">
+								<html:option value="true"><fmt:message key="label.yes"/></html:option>
+								<html:option value="false"><fmt:message key="label.no"/></html:option>
+								</html:select>
+							</td>
+						</tr>
+					</c:when>
+					<c:otherwise>
+						<html:hidden property="enableFlash" />
+					</c:otherwise>
+				</c:choose>				
+				
 				<tr>
 					<td class="align-right"><fmt:message key="admin.organisation.locale"/>:</td>
 					<td>
@@ -130,7 +149,21 @@
 						</html-el:select>
 					</td>
 				</tr>
+				
 				<tr>
+					<td class="align-right"><fmt:message key="admin.user.time.zone"/>:</td>
+					<td>
+						<html:select property="timeZone" style="width:328px;">
+							<c:forEach items="${timezoneDtos}" var="timezoneDto">
+								<html:option value="${timezoneDto.timeZoneId}">
+									${timezoneDto.timeZoneId} - ${timezoneDto.displayName}
+								</html:option>
+							</c:forEach>	
+						</html:select>
+					</td>
+				</tr>				
+				
+				<tr>
 					<td class="align-right"><fmt:message key="label.html.htmlTheme"/>:</td>
 					<td>
 					<html:select property="userCSSTheme">