diff --git a/apps/dav/lib/Provisioning/Apple/AppleProvisioningPlugin.php b/apps/dav/lib/Provisioning/Apple/AppleProvisioningPlugin.php
index f92bc4f3a0d4c..7d0d37b1c1879 100644
--- a/apps/dav/lib/Provisioning/Apple/AppleProvisioningPlugin.php
+++ b/apps/dav/lib/Provisioning/Apple/AppleProvisioningPlugin.php
@@ -137,7 +137,8 @@ public function httpGet(RequestInterface $request, ResponseInterface $response):
 		$server_url = $parsedUrl['host'];
 
 		$description = $this->themingDefaults->getName();
-		$userId = $user->getUID();
+		/* getUID -> getEMailAddress = Closes #29344 */
+		$userId = $user->getEMailAddress();
 
 		$reverseDomain = implode('.', array_reverse(explode('.', $parsedUrl['host'])));
 
diff --git a/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningPluginTest.php b/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningPluginTest.php
index 5bff59cbc7c8c..d18d2467e2141 100644
--- a/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningPluginTest.php
+++ b/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningPluginTest.php
@@ -150,7 +150,7 @@ public function testHttpGetOnHttps() {
 
 		$user = $this->createMock(IUser::class);
 		$user->expects($this->at(0))
-			->method('getUID')
+			->method('getEMailAddress')
 			->willReturn('userName');
 
 		$this->userSession->expects($this->at(0))