diff --git a/phpgwapi/doc/ldap/iplanet/phpgw.oc.conf b/phpgwapi/doc/ldap/iplanet/phpgw.oc.conf
index 106ab9b0ae..35055a4f05 100644
--- a/phpgwapi/doc/ldap/iplanet/phpgw.oc.conf
+++ b/phpgwapi/doc/ldap/iplanet/phpgw.oc.conf
@@ -2,12 +2,12 @@ objectclass phpgwaccount
 	oid 1.3.6.1.4.1.9554.0
 	requires
 		objectClass,
-		uid,
+		uid
+	allows
 		phpgwaccountlastlogin,
 		phpgwaccountlastloginfrom,
 		phpgwlastpasswdchange,
 		phpgwaccounttype,
 		phpgwaccountstatus,
-		phpgwaccountexpires
-	allows
+		phpgwaccountexpires,
 		seeAlso
diff --git a/phpgwapi/doc/ldap/phpgw.oc.conf b/phpgwapi/doc/ldap/phpgw.oc.conf
index 91026f35c3..55620cbb71 100644
--- a/phpgwapi/doc/ldap/phpgw.oc.conf
+++ b/phpgwapi/doc/ldap/phpgw.oc.conf
@@ -1,10 +1,12 @@
 objectclass phpgwAccount
 	requires
 		objectClass,
-		uid,
-		phpgwaccountstatus,
-		phpgwaccountlastlogin,
-		phpgwaccountlastloginip,
-		phpgwaccountexpires
+		uid
 	allows
+		phpgwaccountlastlogin,
+		phpgwaccountlastloginfrom,
+		phpgwlastpasswdchange,
+		phpgwaccounttype,
+		phpgwaccountstatus,
+		phpgwaccountexpires,
 		seeAlso
diff --git a/phpgwapi/doc/ldap/phpgwaccount.schema b/phpgwapi/doc/ldap/phpgwaccount.schema
index 3dccc9ea33..ad9405c6be 100644
--- a/phpgwapi/doc/ldap/phpgwaccount.schema
+++ b/phpgwapi/doc/ldap/phpgwaccount.schema
@@ -2,7 +2,7 @@
 
 # lastlogin
 attributetype ( 1.3.6.1.4.1.9554.1
-	NAME 'phpgwLastLogin'
+	NAME 'phpgwAccountLastLogin'
 	DESC 'timestamp of last login'
 	EQUALITY integerMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
@@ -10,7 +10,7 @@ attributetype ( 1.3.6.1.4.1.9554.1
 
 # lastloginfrom
 attributetype ( 1.3.6.1.4.1.9554.2
-	NAME 'phpgwLastLoginFrom'
+	NAME 'phpgwAccountLastLoginFrom'
 	DESC 'IP address as a dotted decimal, eg. 192.168.1.1, omitting leading zeros'
 	EQUALITY caseIgnoreIA5Match
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{128} )
@@ -40,7 +40,7 @@ attributetype ( 1.3.6.1.4.1.9554.5
 
 # expires
 attributetype ( 1.3.6.1.4.1.9554.6
-	NAME 'phpgwExpires'
+	NAME 'phpgwAccountExpires'
 	DESC 'timestamp for account expiration'
 	EQUALITY integerMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
@@ -49,5 +49,5 @@ attributetype ( 1.3.6.1.4.1.9554.6
 # Objectclass definition for phpgwAccount
 objectclass ( 1.3.6.1.4.1.9554.0 NAME 'phpgwAccount' SUP top AUXILIARY
 	DESC 'Abstraction of an account with phpgw attributes'
-	MAY ( phpgwLastLogin $ phpgwLastLoginFrom $ phpgwLastPasswdChange $ phpgwAccountType $ phpgwAccountStatus ) )
+	MAY ( phpgwAccountLastLogin $ phpgwAccountLastLoginFrom $ phpgwLastPasswdChange $ phpgwAccountType $ phpgwAccountStatus & phpgwAccountExpires) )