diff --git a/lib/private/Authentication/WebAuthn/CredentialRepository.php b/lib/private/Authentication/WebAuthn/CredentialRepository.php
index f4ff950e17b215fd236a5bc949a8612e1dc203c9..f75b4b5ae463195a2c21e0e8c49936d54875c090 100644
--- a/lib/private/Authentication/WebAuthn/CredentialRepository.php
+++ b/lib/private/Authentication/WebAuthn/CredentialRepository.php
@@ -71,7 +71,9 @@ class CredentialRepository implements PublicKeyCredentialSourceRepository {
 		} catch (IMapperException $e) {
 		}
 
+		$defaultName = false;
 		if ($name === null) {
+			$defaultName = true;
 			$name = 'default';
 		}
 
@@ -79,7 +81,7 @@ class CredentialRepository implements PublicKeyCredentialSourceRepository {
 
 		if ($oldEntity) {
 			$entity->setId($oldEntity->getId());
-			if ($name === null) {
+			if ($defaultName) {
 				$entity->setName($oldEntity->getName());
 			}
 		}