diff --git a/phpgwapi/inc/class.accounts_ldap.inc.php b/phpgwapi/inc/class.accounts_ldap.inc.php
index 764200c3ff..74c011d1d5 100644
--- a/phpgwapi/inc/class.accounts_ldap.inc.php
+++ b/phpgwapi/inc/class.accounts_ldap.inc.php
@@ -298,7 +298,7 @@
 								// remove the uid from memberuid
 								$newData['memberuid'] = array_flip($newData['memberuid']); 
 								unset($newData['memberuid'][$oldAccountID]);
-								$newData['memberuid'] = array_values(array_unique(array_flip($newData['memberuid'])));
+								$newData['memberuid'] = array_values(sort(array_flip($newData['memberuid'])));
 								ldap_mod_replace($this->ds, $dn, $newData);
 								#print ldap_error($this->ds);
 								
@@ -314,7 +314,7 @@
 									// remove the uid from memberuid
 									$newData['memberuid'] = array_flip($newData['memberuid']); 
 									unset($newData['memberuid'][$oldAccountID]);
-									$newData['memberuid'] = array_values(array_unique(array_flip($newData['memberuid'])));
+									$newData['memberuid'] = array_values(sort(array_flip($newData['memberuid'])));
 									ldap_mod_replace($this->ds, $dn, $newData);
 									#print ldap_error($this->ds);
 								}
diff --git a/phpgwapi/inc/class.send.inc.php b/phpgwapi/inc/class.send.inc.php
index 771e8e269f..551e6144ec 100644
--- a/phpgwapi/inc/class.send.inc.php
+++ b/phpgwapi/inc/class.send.inc.php
@@ -74,7 +74,7 @@
 				{
 					$header .= 'X-phpGW-Type: '.$msgtype."\n";
 				}
-				$header .= 'X-Mailer: phpGroupWare (http://www.phpgroupware.org)'."\n";
+				$header .= 'X-Mailer: eGroupWare (http://www.egroupware.org)'."\n";
 
 				/* // moved to email/send_message.php
 				if ($GLOBALS['phpgw_info']['user']['preferences']['email']['email_sig'] && $attach_sig)