diff --git a/lam/lib/modules/phpGroupwareUser.inc b/lam/lib/modules/phpGroupwareUser.inc
index 9a034681..a8bd579a 100644
--- a/lam/lib/modules/phpGroupwareUser.inc
+++ b/lam/lib/modules/phpGroupwareUser.inc
@@ -456,7 +456,9 @@ class phpGroupwareUser extends baseModule implements passwordService {
 		if (!in_array('posixAccount', $modules)) {
 			return array();
 		}
-		$this->attributes['phpgwLastPasswordChange'][0] = time();
+		if (in_array_ignore_case('phpgwAccount', $this->attributes['objectClass'])) {
+			$this->attributes['phpgwLastPasswordChange'][0] = time();
+		}
 		return array();
 	}
 		
diff --git a/lam/lib/modules/shadowAccount.inc b/lam/lib/modules/shadowAccount.inc
index d4a4ee56..248b6f21 100644
--- a/lam/lib/modules/shadowAccount.inc
+++ b/lam/lib/modules/shadowAccount.inc
@@ -519,7 +519,9 @@ class shadowAccount extends baseModule implements passwordService {
 		if (!in_array('posixAccount', $modules)) {
 			return array();
 		}
-		$this->attributes['shadowLastChange'][0] = intval(time()/3600/24);
+		if (in_array_ignore_case('shadowAccount', $this->attributes['objectClass'])) {
+			$this->attributes['shadowLastChange'][0] = intval(time()/3600/24);
+		}
 		return array();
 	}