diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php
index 5e0637c1a3ac0..8909703154be8 100644
--- a/apps/sharebymail/lib/ShareByMailProvider.php
+++ b/apps/sharebymail/lib/ShareByMailProvider.php
@@ -269,10 +269,9 @@ public function sendMailNotification(IShare $share): bool {
 				// Lastly, if the mail to recipient failed, we send the password to the owner as a fallback.
 				// If a password expires, the recipient will still be able to request a new one via talk.
 				$passwordExpire = $this->config->getSystemValue('sharing.enable_mail_link_password_expiration', false);
-				$passwordEnforced = $this->shareManager->shareApiLinkEnforcePassword();
 				if ($passwordExpire === false || $share->getSendPasswordByTalk()) {
 					$send = $this->sendPassword($share, $share->getPassword(), $validEmails);
-					if ($passwordEnforced && $send === false) {
+					if ($send === false) {
 						$this->sendPasswordToOwner($share, $share->getPassword());
 					}
 				}
@@ -567,7 +566,7 @@ protected function sendPasswordToOwner(IShare $share, string $password): bool {
 		$initiator = $this->userManager->get($share->getSharedBy());
 		$initiatorEMailAddress = ($initiator instanceof IUser) ? $initiator->getEMailAddress() : null;
 		$initiatorDisplayName = ($initiator instanceof IUser) ? $initiator->getDisplayName() : $share->getSharedBy();
-		$shareWith = $share->getSharedWith();
+		$shareWith = implode(', ', $this->getSharedWithEmails($share));
 
 		if ($initiatorEMailAddress === null) {
 			throw new \Exception(
diff --git a/apps/sharebymail/tests/ShareByMailProviderTest.php b/apps/sharebymail/tests/ShareByMailProviderTest.php
index 05435b835e095..b226b6ea61bf8 100644
--- a/apps/sharebymail/tests/ShareByMailProviderTest.php
+++ b/apps/sharebymail/tests/ShareByMailProviderTest.php
@@ -313,6 +313,8 @@ public function testCreateSendPasswordByMailWithPasswordAndWithoutEnforcedPasswo
 			->with('sharing.enable_mail_link_password_expiration')
 			->willReturn(true);
 
+		$this->settingsManager->expects($this->once())->method('sendPasswordByMail')->willReturn(true);
+
 		// No password has been set and no password sent via talk has been requested,
 		// but password has been enforced for the whole instance and will be generated.
 		$instance->expects($this->once())->method('sendEmail')->with($share, ['receiver@example.com']);
@@ -323,6 +325,51 @@ public function testCreateSendPasswordByMailWithPasswordAndWithoutEnforcedPasswo
 		$instance->sendMailNotification($share);
 	}
 
+
+	public function testCreateSendPasswordToOwnerWhenSendPasswordByMailIsDisabled(): void {
+		$expectedShare = $this->createMock(IShare::class);
+		$node = $this->getMockBuilder(File::class)->getMock();
+		$node->method('getName')->willReturn('filename');
+	
+		$share = $this->getMockBuilder(IShare::class)->getMock();
+		$share->method('getSharedWith')->willReturn('receiver@example.com');
+		$share->method('getSendPasswordByTalk')->willReturn(false);
+		$share->method('getSharedBy')->willReturn('owner');
+		$share->method('getNode')->willReturn($node);
+		$share->method('getId')->willReturn(42);
+		$share->method('getNote')->willReturn('');
+		$share->method('getToken')->willReturn('token');
+		$share->method('getPassword')->willReturn('password');
+	
+		$this->mailer->method('validateMailAddress')->willReturn(true);
+		$this->hasher->expects($this->once())->method('hash')->with('password')->willReturn('passwordHashed');
+		$share->expects($this->once())->method('setPassword')->with('passwordHashed');
+	
+		$instance = $this->getInstance([
+			'getSharedWith', 'createMailShare', 'getRawShare', 'createShareObject',
+			'createShareActivity', 'autoGeneratePassword', 'createPasswordSendActivity',
+			'sendEmail', 'sendPassword', 'sendPasswordToOwner',
+		]);
+	
+		$instance->expects($this->once())->method('getSharedWith')->willReturn([]);
+		$instance->expects($this->once())->method('createMailShare')->with($share)->willReturn(42);
+		$instance->expects($this->once())->method('createShareActivity')->with($share);
+		$instance->expects($this->once())->method('getRawShare')->with(42)->willReturn(['rawShare', 'password' => 'password']);
+		$instance->expects($this->once())->method('createShareObject')->with(['rawShare', 'password' => 'password'])->willReturn($expectedShare);
+	
+		$this->shareManager->method('shareApiLinkEnforcePassword')->willReturn(false);
+		$this->config->expects($this->once())->method('getSystemValue')->with('sharing.enable_mail_link_password_expiration')->willReturn(true);
+		$this->settingsManager->expects($this->once())->method('sendPasswordByMail')->willReturn(false);
+	
+		$instance->expects($this->once())->method('sendPasswordToOwner')->with($share);
+		$instance->expects($this->once())->method('sendEmail')->with($share, ['receiver@example.com']);
+		$instance->expects($this->never())->method('sendPassword');
+	
+		$this->assertSame($expectedShare, $instance->create($share));
+		$instance->sendMailNotification($share);
+	}
+	
+
 	public function testCreateSendPasswordByMailWithEnforcedPasswordProtectionWithPermanentPassword(): void {
 		$expectedShare = $this->createMock(IShare::class);