diff --git a/apps/settings/lib/Controller/AuthSettingsController.php b/apps/settings/lib/Controller/AuthSettingsController.php
index b5076456e0f5f..71934382a171a 100644
--- a/apps/settings/lib/Controller/AuthSettingsController.php
+++ b/apps/settings/lib/Controller/AuthSettingsController.php
@@ -105,9 +105,11 @@ public function create($name) {
 			$name = mb_substr($name, 0, 120) . '…';
 		}
 
+		$displayLoginName = $this->userSession->getUser()?->getEMailAddress() ?: $loginName;
 		$token = $this->generateRandomDeviceToken();
-		$deviceToken = $this->tokenProvider->generateToken($token, $this->userId, $loginName, $password, $name, IToken::PERMANENT_TOKEN);
+		$deviceToken = $this->tokenProvider->generateToken($token, $this->userId, $displayLoginName, $password, $name, IToken::PERMANENT_TOKEN);
 		$tokenData = $deviceToken->jsonSerialize();
+		$tokenData['loginName'] = $displayLoginName;
 		$tokenData['canDelete'] = true;
 		$tokenData['canRename'] = true;
 
@@ -115,7 +117,7 @@ public function create($name) {
 
 		return new JSONResponse([
 			'token' => $token,
-			'loginName' => $loginName,
+			'loginName' => $displayLoginName,
 			'deviceToken' => $tokenData,
 		]);
 	}