diff --git a/lib/private/User/User.php b/lib/private/User/User.php
index a3be0c24bb9..f55807bc769 100644
--- a/lib/private/User/User.php
+++ b/lib/private/User/User.php
@@ -342,9 +342,13 @@ class User implements IUser {
 	 * @param bool $enabled
 	 */
 	public function setEnabled($enabled) {
+		$oldStatus = $this->isEnabled();
 		$this->enabled = $enabled;
 		$enabled = ($enabled) ? 'true' : 'false';
-		$this->config->setUserValue($this->uid, 'core', 'enabled', $enabled);
+		if ($oldStatus !== $this->enabled) {
+			$this->triggerChange('enabled', $enabled);
+			$this->config->setUserValue($this->uid, 'core', 'enabled', $enabled);
+		}
 	}
 
 	/**
diff --git a/tests/lib/User/UserTest.php b/tests/lib/User/UserTest.php
index 5fc07b692f7..b53d07b0d4e 100644
--- a/tests/lib/User/UserTest.php
+++ b/tests/lib/User/UserTest.php
@@ -705,7 +705,55 @@ class UserTest extends TestCase {
 				'false'
 			);
 
-		$user = new User('foo', $backend, null, $config);
+		$user = $this->getMockBuilder(User::class)
+			->setConstructorArgs([
+				'foo',
+				$backend,
+				null,
+				$config,
+			])
+			->setMethods(['isEnabled', 'triggerChange'])
+			->getMock();
+
+		$user->expects($this->once())
+			->method('isEnabled')
+			->willReturn(true);
+		$user->expects($this->once())
+			->method('triggerChange')
+			->with(
+				'enabled',
+				'false'
+			);
+
+		$user->setEnabled(false);
+	}
+
+	public function testSetDisabledAlreadyDisabled() {
+		/**
+		 * @var Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+		 */
+		$backend = $this->createMock(\Test\Util\User\Dummy::class);
+
+		$config = $this->createMock(IConfig::class);
+		$config->expects($this->never())
+			->method('setUserValue');
+
+		$user = $this->getMockBuilder(User::class)
+			->setConstructorArgs([
+				'foo',
+				$backend,
+				null,
+				$config,
+			])
+			->setMethods(['isEnabled', 'triggerChange'])
+			->getMock();
+
+		$user->expects($this->once())
+			->method('isEnabled')
+			->willReturn(false);
+		$user->expects($this->never())
+			->method('triggerChange');
+
 		$user->setEnabled(false);
 	}