diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index 253b1e715..e6c5a498e 100644
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -185,10 +185,8 @@ static NSTimeZone *serverTimeZone = nil;
       timeZoneName = [[self userDefaults] stringForKey: @"TimeZone"];
       if ([timeZoneName length] > 0)
 	userTimeZone = [NSTimeZone timeZoneWithName: timeZoneName];
-      else
-	userTimeZone = nil;
       if (!userTimeZone)
-	userTimeZone = [self serverTimeZone];
+	userTimeZone = serverTimeZone;
       [userTimeZone retain];
     }