diff --git a/apps/user_ldap/lib/User/User.php b/apps/user_ldap/lib/User/User.php
index d68d8b35d1407206f8f1b8f920ce107d301a3df6..5c89950e080a339f441d95c6c1c1509b5eae1cff 100644
--- a/apps/user_ldap/lib/User/User.php
+++ b/apps/user_ldap/lib/User/User.php
@@ -436,7 +436,7 @@ class User {
 			if (!empty($oldName) && $user instanceof \OC\User\User) {
 				// if it was empty, it would be a new record, not a change emitting the trigger could
 				// potentially cause a UniqueConstraintViolationException, depending on some factors.
-				$user->triggerChange('displayName', $displayName);
+				$user->triggerChange('displayName', $displayName, $oldName);
 			}
 		}
 		return $displayName;
diff --git a/lib/private/User/User.php b/lib/private/User/User.php
index 17fa022b1b7e3e833488358172b4a751ccce93bc..a47ef8dc5435ff04615a3894aab34a372edcf2e1 100644
--- a/lib/private/User/User.php
+++ b/lib/private/User/User.php
@@ -145,9 +145,8 @@ class User implements IUser {
 				$this->triggerChange('displayName', $displayName);
 			}
 			return $result !== false;
-		} else {
-			return false;
 		}
+		return false;
 	}
 
 	/**
@@ -365,7 +364,8 @@ class User implements IUser {
 		$oldStatus = $this->isEnabled();
 		$this->enabled = $enabled;
 		if ($oldStatus !== $this->enabled) {
-			$this->triggerChange('enabled', $enabled);
+			// TODO: First change the value, then trigger the event as done for all other properties.
+			$this->triggerChange('enabled', $enabled, $oldStatus);
 			$this->config->setUserValue($this->uid, 'core', 'enabled', $enabled ? 'true' : 'false');
 		}
 	}
@@ -409,7 +409,7 @@ class User implements IUser {
 		}
 		$this->config->setUserValue($this->uid, 'files', 'quota', $quota);
 		if($quota !== $oldQuota) {
-			$this->triggerChange('quota', $quota);
+			$this->triggerChange('quota', $quota, $oldQuota);
 		}
 	}