Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r009fbce36f45d0929f8007c4bbc798242f57d3af -r862d181bb03e2bbaaf0a9e98c3877a0aff84fdf9
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 009fbce36f45d0929f8007c4bbc798242f57d3af)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 862d181bb03e2bbaaf0a9e98c3877a0aff84fdf9)
@@ -459,6 +459,8 @@
 admin.servertimezone.dst.offset  =DST offset: {0}
 admin.servertimezone.name  =Name: {0}
 admin.servertimezone.select  =Select
+admin.user.enable.flash.for.learner.window  =Enable Flash for Learner Window
+admin.user.time.zone  =Time Zone
 
 
 #======= End labels: Exported 437 labels for en AU =====
Index: lams_admin/conf/xdoclet/struts-forms.xml
===================================================================
diff -u -r009fbce36f45d0929f8007c4bbc798242f57d3af -r862d181bb03e2bbaaf0a9e98c3877a0aff84fdf9
--- lams_admin/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 009fbce36f45d0929f8007c4bbc798242f57d3af)
+++ lams_admin/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 862d181bb03e2bbaaf0a9e98c3877a0aff84fdf9)
@@ -46,6 +46,8 @@
 	<form-property name="localeId" type="java.lang.Integer" />
 	<form-property name="tutorialsDisabled" type="java.lang.Boolean" initial="false" />
 	<form-property name="firstLogin" type="java.lang.Boolean" initial="true" />
+	<form-property name="timeZone" type="java.lang.String" />
+	<form-property name="enableFlash" type="java.lang.Boolean" />	
 	<form-property name="userCSSTheme" type="java.lang.Long" />
 	<form-property name="userFlashTheme" type="java.lang.Long" />
 </form-bean>
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java
===================================================================
diff -u -r009fbce36f45d0929f8007c4bbc798242f57d3af -r862d181bb03e2bbaaf0a9e98c3877a0aff84fdf9
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java	(.../UserAction.java)	(revision 009fbce36f45d0929f8007c4bbc798242f57d3af)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java	(.../UserAction.java)	(revision 862d181bb03e2bbaaf0a9e98c3877a0aff84fdf9)
@@ -85,6 +85,7 @@
     private IUserManagementService service;
     private MessageService messageService;
     private static IThemeService themeService;
+    private static ITimezoneService timezoneService;    
     private static List<SupportedLocale> locales;
     private static List<AuthenticationMethod> authenticationMethods;
 
@@ -98,6 +99,9 @@
 	if (themeService == null) {
 	    themeService = AdminServiceProxy.getThemeService(getServlet().getServletContext());
 	}
+	if (timezoneService == null) {
+	    timezoneService = AdminServiceProxy.getTimezoneService(getServlet().getServletContext());
+	}	
     }
 
     public ActionForward edit(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception {
@@ -217,6 +221,18 @@
 	    }
 	}
 	userForm.set("orgId", (org == null ? null : org.getOrganisationId()));
+		
+	// Get all available time zones
+	List<Timezone> availableTimeZones = timezoneService.getDefaultTimezones();
+	TreeSet<TimezoneDTO> timezoneDtos = new TreeSet<TimezoneDTO>(new TimezoneDTOComparator());
+	for (Timezone availableTimeZone : availableTimeZones) {
+	    String timezoneId = availableTimeZone.getTimezoneId();
+	    TimezoneDTO timezoneDto = new TimezoneDTO();
+	    timezoneDto.setTimeZoneId(timezoneId);
+	    timezoneDto.setDisplayName(TimeZone.getTimeZone(timezoneId).getDisplayName());
+	    timezoneDtos.add(timezoneDto);
+	}
+	request.setAttribute("timezoneDtos", timezoneDtos);
 
 	// for breadcrumb links
 	if (org != null) {
Index: lams_admin/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r009fbce36f45d0929f8007c4bbc798242f57d3af -r862d181bb03e2bbaaf0a9e98c3877a0aff84fdf9
--- lams_admin/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 009fbce36f45d0929f8007c4bbc798242f57d3af)
+++ lams_admin/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 862d181bb03e2bbaaf0a9e98c3877a0aff84fdf9)
@@ -102,6 +102,8 @@
 	<form-property name="localeId" type="java.lang.Integer" />
 	<form-property name="tutorialsDisabled" type="java.lang.Boolean" initial="false" />
 	<form-property name="firstLogin" type="java.lang.Boolean" initial="true" />
+	<form-property name="timeZone" type="java.lang.String" />
+	<form-property name="enableFlash" type="java.lang.Boolean" />	
 	<form-property name="userCSSTheme" type="java.lang.Long" />
 	<form-property name="userFlashTheme" type="java.lang.Long" />
 </form-bean>
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">