diff --git a/ChangeLog b/ChangeLog
index 73709dd45..b01b1e6cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-18  Ludovic Marcotte <lmarcotte@inverse.ca>
+	
+	* Replaced SOGoUIxUserCanChangePassword with
+	SOGoPasswordChangeEnabled
+
+	* Removed unused prefs / code.
+
 2010-03-15  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/SOGoUserFolder.m (-davUsersQuery): we invoke
diff --git a/SoObjects/SOGo/SOGoConstants.h b/SoObjects/SOGo/SOGoConstants.h
index c4fdfa8db..08d16101c 100644
--- a/SoObjects/SOGo/SOGoConstants.h
+++ b/SoObjects/SOGo/SOGoConstants.h
@@ -43,6 +43,5 @@ typedef enum
 
 // Domain defaults
 extern NSString *SOGoPasswordChangeEnabled;
-extern NSString *SOGoPasswordPolicyEnabled;
 
 #endif /* _SOGOCONSTANTS_H_ */
diff --git a/SoObjects/SOGo/SOGoConstants.m b/SoObjects/SOGo/SOGoConstants.m
index 6e1b0202c..947963422 100644
--- a/SoObjects/SOGo/SOGoConstants.m
+++ b/SoObjects/SOGo/SOGoConstants.m
@@ -24,4 +24,3 @@
 
 // LDAP Password Policy Constants
 NSString* SOGoPasswordChangeEnabled = @"SOGoPasswordChangeEnabled";
-NSString* SOGoPasswordPolicyEnabled = @"SOGoPasswordPolicyEnabled";
diff --git a/SoObjects/SOGo/SOGoDomainDefaults.h b/SoObjects/SOGo/SOGoDomainDefaults.h
index b07856960..78de03b78 100644
--- a/SoObjects/SOGo/SOGoDomainDefaults.h
+++ b/SoObjects/SOGo/SOGoDomainDefaults.h
@@ -46,8 +46,6 @@
 - (BOOL) sieveScriptsEnabled;
 - (BOOL) forwardEnabled;
 - (BOOL) vacationEnabled;
-- (BOOL) passwordChangeEnabled;
-- (BOOL) passwordPolicyEnabled;
 - (NSString *) mailingMechanism;
 - (NSString *) smtpServer;
 - (NSString *) mailSpoolPath;
diff --git a/SoObjects/SOGo/SOGoDomainDefaults.m b/SoObjects/SOGo/SOGoDomainDefaults.m
index 52c9a22c0..fc77834d0 100644
--- a/SoObjects/SOGo/SOGoDomainDefaults.m
+++ b/SoObjects/SOGo/SOGoDomainDefaults.m
@@ -171,16 +171,6 @@
   return [self boolForKey: @"SOGoVacationEnabled"];
 }
 
-- (BOOL) passwordChangeEnabled
-{
-  return [self boolForKey: SOGoPasswordChangeEnabled];
-}
-
-- (BOOL) passwordPolicyEnabled
-{
-  return [self boolForKey: SOGoPasswordPolicyEnabled];
-}
-
 - (NSString *) mailingMechanism
 {
   NSString *mailingMechanism;
diff --git a/SoObjects/SOGo/SOGoSystemDefaults.m b/SoObjects/SOGo/SOGoSystemDefaults.m
index f9ed9531b..12d7306aa 100644
--- a/SoObjects/SOGo/SOGoSystemDefaults.m
+++ b/SoObjects/SOGo/SOGoSystemDefaults.m
@@ -34,6 +34,7 @@
 #import "SOGoStartupLogger.h"
 
 #import "SOGoSystemDefaults.h"
+#import "SOGoConstants.h"
 
 @implementation SOGoSystemDefaults
 
@@ -277,7 +278,7 @@ BootstrapNSUserDefaults ()
 
 - (BOOL) userCanChangePassword
 {
-  return [self boolForKey: @"SOGoUIxUserCanChangePassword"];
+  return [self boolForKey: SOGoPasswordChangeEnabled];
 }
 
 - (BOOL) uixAdditionalPreferences