Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
===================================================================
diff -u -r917cdcbcb307b39b90b65f7b97a5b5f7863d7c5b -r455c0190de52ccfe3116ecf5d805e344a6506b69
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(.../User.java)	(revision 917cdcbcb307b39b90b65f7b97a5b5f7863d7c5b)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(.../User.java)	(revision 455c0190de52ccfe3116ecf5d805e344a6506b69)
@@ -503,7 +503,6 @@
 
 	return new UserDTO(userId, firstName, lastName, login, languageIsoCode, countryIsoCode, direction, email,
 		theme != null ? new ThemeDTO(theme) : null,
-		// TimeZone.getTimeZone("Australia/Sydney"),
 		timeZone, authenticationMethod.getAuthenticationMethodId(), fckLanguageMapping,
 		(tutorialsDisabled == null ? false : true), // assume tutorials enabled if not set
 		tutorialPages, 
@@ -596,7 +595,7 @@
 
     public String getTimeZone() {
 	if (timeZone == null) {
-	    timeZone = TimeZone.getDefault().getID();
+	    return TimeZone.getDefault().getID();
 	}
 	return timeZone;
     }