Index: lams_central/web/main.jsp
===================================================================
diff -u -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2 -ra1a698605f9903c5211c6726c2b5ad034e5f78b2
--- lams_central/web/main.jsp	(.../main.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
+++ lams_central/web/main.jsp	(.../main.jsp)	(revision a1a698605f9903c5211c6726c2b5ad034e5f78b2)
@@ -101,11 +101,11 @@
 				startTour();
 			</c:if>
 
-			<c:if test="${showTimezoneWarning}"> 
+			<c:if test="${showTimezoneWarning}">
 		    var current_date = new Date( );
 		    var client_gmt_offset_minutes = current_date.getTimezoneOffset( );
 		    $('#offset').html( client_gmt_offset_minutes / 60 );
-		    var lams_gmt_offset_minutes = ( <lams:user property="timeZone.rawOffset"/> + <lams:user property="timeZone.DSTSavings"/> ) / 60000;
+		    var lams_gmt_offset_minutes = <lams:user property="timeZoneOffsetSeconds"/> / 60;
 		    if ( client_gmt_offset_minutes != -lams_gmt_offset_minutes ) {
 			    $('#timezoneWarning').html( '<BR/><fmt:message key="label.timezone.warning"/>');
 				<c:if test="${showTimezoneWarningPopup}"> 
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java
===================================================================
diff -u -r365a2c22199a5fe2b1e55e18cbf4b6d2596f202b -ra1a698605f9903c5211c6726c2b5ad034e5f78b2
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java	(.../UserDTO.java)	(revision 365a2c22199a5fe2b1e55e18cbf4b6d2596f202b)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java	(.../UserDTO.java)	(revision a1a698605f9903c5211c6726c2b5ad034e5f78b2)
@@ -24,6 +24,8 @@
 package org.lamsfoundation.lams.usermanagement.dto;
 
 import java.io.Serializable;
+import java.time.Instant;
+import java.time.ZoneId;
 import java.util.TimeZone;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
@@ -47,6 +49,7 @@
     private String email;
     private ThemeDTO theme;
     private TimeZone timeZone;
+    private int timeZoneOffsetSeconds;
     private Integer authenticationMethodId;
     private Boolean firstLogin;
     private Integer lastVisitedOrganisationId;
@@ -65,7 +68,8 @@
 	this.direction = direction;
 	this.email = email;
 	this.theme = htmlTheme;
-	timeZone = timezone;
+	this.timeZone = timezone;
+	this.timeZoneOffsetSeconds = ZoneId.of(timeZone.getID()).getRules().getOffset(Instant.now()).getTotalSeconds();
 	this.authenticationMethodId = authenticationMethodId;
 	this.fckLanguageMapping = fckLanguageMapping;
 	this.firstLogin = firstLogin;
@@ -153,6 +157,10 @@
 	return timeZone;
     }
 
+    public int getTimeZoneOffsetSeconds() {
+	return timeZoneOffsetSeconds;
+    }
+
     public Integer getAuthenticationMethodId() {
 	return authenticationMethodId;
     }