diff --git a/ChangeLog b/ChangeLog
index 31f385538..88fe758a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-07  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/PreferencesUI/UIxPreferences.m (-defaultAction):
+	setVacationOptions: and setForwardOptions: are now set from here.
+
+	* SoObjects/SOGo/SOGoDomainDefaults.m (-forwardEnabled)
+	(-vacationEnabled): we must query "SOGoForwardEnabled" and
+	"SOGoVacationEnabled", respectively.
+
 2009-12-02  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/SOGoUserDefaults.m (+initialize): we need to
diff --git a/SoObjects/SOGo/SOGoDomainDefaults.m b/SoObjects/SOGo/SOGoDomainDefaults.m
index bf524ab30..a4ab1bab4 100644
--- a/SoObjects/SOGo/SOGoDomainDefaults.m
+++ b/SoObjects/SOGo/SOGoDomainDefaults.m
@@ -152,12 +152,12 @@
 
 - (BOOL) forwardEnabled
 {
-  return [self boolForKey: @"SOGoForceIMAPLoginWithEmail"];
+  return [self boolForKey: @"SOGoForwardEnabled"];
 }
 
 - (BOOL) vacationEnabled
 {
-  return [self boolForKey: @"SOGoForceIMAPLoginWithEmail"];
+  return [self boolForKey: @"SOGoVacationEnabled"];
 }
 
 - (NSString *) mailingMechanism
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index 5cda8e49b..1f80475ae 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -87,20 +87,14 @@
 	{
 	  vacationOptions = [[userDefaults vacationOptions] mutableCopy];
 	  if (!vacationOptions)
-	    {
-	      vacationOptions = [NSMutableDictionary new];
-	      [userDefaults setVacationOptions: vacationOptions];
-	    }
+            vacationOptions = [NSMutableDictionary new];
 	}
 
       if ([dd forwardEnabled])
 	{
 	  forwardOptions = [[userDefaults forwardOptions] mutableCopy];
 	  if (!forwardOptions)
-	    {
-	      forwardOptions = [NSMutableDictionary new];
-	      [userDefaults setForwardOptions: forwardOptions];
-	    }
+            forwardOptions = [NSMutableDictionary new];
 	}
     }
 
@@ -875,6 +869,7 @@
   id <WOActionResults> results;
   WORequest *request;
   NSString *method;
+  SOGoDomainDefaults *dd;
 
   request = [context request];
   if ([[request method] isEqualToString: @"POST"])
@@ -882,7 +877,13 @@
       SOGoMailAccount *account;
       id mailAccounts;
       id folder;
-     
+
+      dd = [[context activeUser] domainDefaults];
+      if ([dd vacationEnabled])
+        [userDefaults setVacationOptions: vacationOptions];
+      if ([dd forwardEnabled])
+        [userDefaults setForwardOptions: forwardOptions];
+
       [userDefaults synchronize];
       
       mailAccounts = [[[context activeUser] mailAccounts] objectAtIndex: 0];