diff --git a/apps/provisioning_api/lib/Controller/AUserData.php b/apps/provisioning_api/lib/Controller/AUserData.php
index 82ca98ced8..6c4967a6c3 100644
--- a/apps/provisioning_api/lib/Controller/AUserData.php
+++ b/apps/provisioning_api/lib/Controller/AUserData.php
@@ -92,7 +92,7 @@ abstract class AUserData extends OCSController {
 		// Should be at least Admin Or SubAdmin!
 		if( $this->groupManager->isAdmin($currentLoggedInUser->getUID())
 			|| $this->groupManager->getSubAdmin()->isUserAccessible($currentLoggedInUser, $targetUserObject)) {
-				$data['enabled'] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'enabled', 'true');
+				$data['enabled'] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'enabled', 'true') === 'true';
 		} else {
 			// Check they are looking up themselves
 			if($currentLoggedInUser->getUID() !== $targetUserObject->getUID()) {
diff --git a/lib/private/User/User.php b/lib/private/User/User.php
index 56c489181d..e171a65f8c 100644
--- a/lib/private/User/User.php
+++ b/lib/private/User/User.php
@@ -349,13 +349,12 @@ class User implements IUser {
 	 *
 	 * @param bool $enabled
 	 */
-	public function setEnabled($enabled) {
+	public function setEnabled(bool $enabled = true) {
 		$oldStatus = $this->isEnabled();
 		$this->enabled = $enabled;
-		$enabled = $enabled ? 'true' : 'false';
 		if ($oldStatus !== $this->enabled) {
 			$this->triggerChange('enabled', $enabled);
-			$this->config->setUserValue($this->uid, 'core', 'enabled', $enabled);
+			$this->config->setUserValue($this->uid, 'core', 'enabled', $enabled ? 'true' : 'false');
 		}
 	}
 
diff --git a/lib/public/IUser.php b/lib/public/IUser.php
index 13aa60b380..3d8515a5e0 100644
--- a/lib/public/IUser.php
+++ b/lib/public/IUser.php
@@ -146,7 +146,7 @@ interface IUser {
 	 * @param bool $enabled
 	 * @since 8.0.0
 	 */
-	public function setEnabled($enabled);
+	public function setEnabled(bool $enabled = true);
 
 	/**
 	 * get the users email address