diff --git a/apps/provisioning_api/lib/Controller/AUserData.php b/apps/provisioning_api/lib/Controller/AUserData.php
index 8069fcb4da5..e358d282061 100644
--- a/apps/provisioning_api/lib/Controller/AUserData.php
+++ b/apps/provisioning_api/lib/Controller/AUserData.php
@@ -156,7 +156,7 @@ abstract class AUserData extends OCSController {
 			foreach ($emailCollection->getProperties() as $property) {
 				$additionalEmails[] = $property->getValue();
 				if ($includeScopes) {
-					$additionalEmailScopes = $property->getScope();
+					$additionalEmailScopes[] = $property->getScope();
 				}
 			}
 			$data[IAccountManager::COLLECTION_EMAIL] = $additionalEmails;
diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php
index f5993e3aa5c..b81801aba28 100644
--- a/apps/provisioning_api/lib/Controller/UsersController.php
+++ b/apps/provisioning_api/lib/Controller/UsersController.php
@@ -673,8 +673,12 @@ class UsersController extends AUserData {
 					}
 				}
 				if ($targetProperty instanceof IAccountProperty) {
-					$targetProperty->setScope($value);
-					$this->accountManager->updateAccount($userAccount);
+					try {
+						$targetProperty->setScope($value);
+						$this->accountManager->updateAccount($userAccount);
+					} catch (\InvalidArgumentException $e) {
+						throw new OCSException('', 102);
+					}
 				} else {
 					throw new OCSException('', 102);
 				}
diff --git a/build/integration/features/bootstrap/Provisioning.php b/build/integration/features/bootstrap/Provisioning.php
index ad22925eddf..e51339c081e 100644
--- a/build/integration/features/bootstrap/Provisioning.php
+++ b/build/integration/features/bootstrap/Provisioning.php
@@ -168,9 +168,6 @@ trait Provisioning {
 		$response = $client->get($fullUrl, $options);
 		foreach ($settings->getRows() as $setting) {
 			$value = json_decode(json_encode(simplexml_load_string($response->getBody())->data->{$setting[0]}), 1);
-			if (in_array($setting[0], ['additional_mail', 'additional_mailScope'], true)) {
-				var_dump($value);
-			}
 			if (isset($value['element']) && in_array($setting[0], ['additional_mail', 'additional_mailScope'], true)) {
 				$expectedValues = explode(';', $setting[1]);
 				foreach ($expectedValues as $expected) {