diff --git a/ChangeLog b/ChangeLog
index c9c899d31..06b9a6f5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-05-17  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Common/UIxObjectActions.m ([UIxObjectActions
+	-addUserInAclsAction]): save the previous roles of the user
+	(unlikely) or the default roles, or None instead of saving the
+	roles that should appear the first time in the role editor when no
+	default has been set...
+
 	* SoObjects/SOGo/SOGoObject.m: defined a new constant
 	"SOGoDefaultUserID".
 
diff --git a/UI/Common/UIxObjectActions.m b/UI/Common/UIxObjectActions.m
index 1d154a665..f3cf99306 100644
--- a/UI/Common/UIxObjectActions.m
+++ b/UI/Common/UIxObjectActions.m
@@ -27,6 +27,7 @@
 #import <NGObjWeb/WOResponse.h>
 #import <SoObjects/SOGo/LDAPUserManager.h>
 #import <SoObjects/SOGo/SOGoObject.h>
+#import <SoObjects/SOGo/SOGoPermissions.h>
 
 #import "UIxObjectActions.h"
 
@@ -49,9 +50,9 @@
       um = [LDAPUserManager sharedUserManager];
       if ([um contactInfosForUserWithUIDorEmail: uid])
         {
-          clientObject = [self clientObject];
-          [clientObject setRoles: [clientObject defaultAclRoles]
-                        forUser: uid];
+	  clientObject = [self clientObject];
+	  [clientObject setRoles: [clientObject aclsForUser: uid]
+			forUser: uid];
           code = 204;
         }
     }
@@ -78,7 +79,8 @@
       um = [LDAPUserManager sharedUserManager];
       if ([um contactInfosForUserWithUIDorEmail: uid])
 	{
-	  [[self clientObject] removeAclsForUsers: [NSArray arrayWithObject: uid]];
+	  [[self clientObject] removeAclsForUsers:
+				 [NSArray arrayWithObject: uid]];
           code = 204;
         }
     }