diff --git a/setup/ldapmodify.php b/setup/ldapmodify.php
index 11593d30f8..46d739e9e8 100644
--- a/setup/ldapmodify.php
+++ b/setup/ldapmodify.php
@@ -164,8 +164,8 @@
 					if($addclass)
 					{
 						reset($entry[0]['objectclass']);
-						unset($replace['objectclass']['count']);
 						$replace['objectclass'] = $entry[0]['objectclass'];
+						unset($replace['objectclass']['count']);
 						$replace['objectclass'][]       = 'phpgwAccount';
 						sort($replace['objectclass']);
 						ldap_mod_replace($ldap,$thisdn,$replace);
@@ -278,6 +278,7 @@
 						$replace['objectclass'] = $entry[0]['objectclass'];
 						unset($replace['objectclass']['count']);
 						$replace['objectclass'][]       = 'phpgwAccount';
+						sort($replace['objectclass']);
 						ldap_mod_replace($ldap,$thisdn,$replace);
 						unset($replace);
 						unset($addclass);