diff --git a/ChangeLog b/ChangeLog
index ac504f264..d0086495f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-08-03  Jean Raby  <jraby@inverse.ca>
+
+	* SoObjects/SOGo/LDAPSource.m (changePasswordForLogin):
+	  if userPasswordAlgorithm was not set or was set to "none",
+		use the plaintext password directly instead of using '{none}plaintext'
+		which isn't valid.
+
 2012-07-31  Jean Raby  <jraby@inverse.ca>
 
 	* sogo.spec:
diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m
index b2a4faff0..86381d3a2 100644
--- a/SoObjects/SOGo/LDAPSource.m
+++ b/SoObjects/SOGo/LDAPSource.m
@@ -631,7 +631,10 @@ andMultipleBookingsField: (NSString *) newMultipleBookingsField
 		    NSArray *changes;
 		    
 		    attr = [[NGLdapAttribute alloc] initWithAttributeName: @"userPassword"];
-		    [attr addStringValue: [self _encryptPassword: newPassword]];
+		    if ([_userPasswordAlgorithm isEqualToString: @"none"])
+		      [attr addStringValue:  newPassword];
+		    else
+		      [attr addStringValue: [self _encryptPassword: newPassword]];
 		    
 		    mod = [NGLdapModification replaceModification: attr];
 		    changes = [NSArray arrayWithObject: mod];