diff --git a/apps/dav/appinfo/app.php b/apps/dav/appinfo/app.php
index 0d417fd3fed2d225d77eacf73d473c3a8de32ad6..963073c44139a2740646f00e0a39f6c856c17563 100644
--- a/apps/dav/appinfo/app.php
+++ b/apps/dav/appinfo/app.php
@@ -50,7 +50,13 @@ $eventDispatcher->addListener('OCP\Federation\TrustedServerEvent::remove',
 $cm = \OC::$server->getContactsManager();
 $cm->register(function() use ($cm, $app) {
 	$user = \OC::$server->getUserSession()->getUser();
-	if (!is_null($user)) {
-		$app->setupContactsProvider($cm, $user->getUID());
+	if (is_null($user)) {
+		return;
 	}
+	if (\OC::$server->getConfig()->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') !== 'yes') {
+		// Don't include system users
+		// This prevents user enumeration in the contacts menu and the mail app
+		return;
+	}
+	$app->setupContactsProvider($cm, $user->getUID());
 });