diff --git a/lam/HISTORY b/lam/HISTORY
index 08fdd952..6e988117 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -3,8 +3,10 @@ January 2009 2.5.0
    -> supports rfc2307bis schema for Unix groups (RFE 2111694)
    -> added alias manangement (object classes alias + uidObject) (RFE 1912779)
   - Shadow: module is now optional when creating new accounts
-  - Kolab: account extension is now optional
-  - Kolab: Self service uses no extra LDAP suffix but uses global setting
+  - Kolab:
+   -> account extension is now optional
+   -> can be used without Unix module
+   -> self service uses no extra LDAP suffix but uses global setting
   - DHCP: added PDF support and minor fixes
   - Samba 3:
    -> self service sets attribute "sambaPwdLastSet" on password change (LAM Pro)
diff --git a/lam/lib/modules/kolabUser.inc b/lam/lib/modules/kolabUser.inc
index 10670982..46b7e50a 100644
--- a/lam/lib/modules/kolabUser.inc
+++ b/lam/lib/modules/kolabUser.inc
@@ -591,10 +591,10 @@ class kolabUser extends baseModule {
 	function module_complete() {
 		if (isset($this->attributes['objectClass']) && in_array('kolabInetOrgPerson', $this->attributes['objectClass'])) {
 			$attrsI = $this->getAccountContainer()->getAccountModule('inetOrgPerson')->getAttributes();
-			$attrsP = $this->getAccountContainer()->getAccountModule('posixAccount')->getAttributes();
 			if (!$attrsI['mail'][0]) return false;
 			if ($this->getAccountContainer()->isNewAccount) {
 				if ($this->getAccountContainer()->getAccountModule('posixAccount') != null) {
+					$attrsP = $this->getAccountContainer()->getAccountModule('posixAccount')->getAttributes();
 					if (!$attrsP['userPassword'][0]) return false;
 				}
 				elseif ($this->getAccountContainer()->getAccountModule('inetOrgPerson') != null) {