diff --git a/compose.ory.yaml b/compose.ory.yaml
index 3275a20d..e589acb2 100644
--- a/compose.ory.yaml
+++ b/compose.ory.yaml
@@ -211,6 +211,7 @@ services:
               hydra create oauth2-client \
                 --endpoint http://hydra:4445 \
                 --id adminfront \
+                --name "AdminFront" \
                 --grant-type authorization_code,refresh_token \
                 --response-type code \
                 --scope openid,offline_access,profile,email \
@@ -220,6 +221,7 @@ services:
               hydra create oauth2-client \
                 --endpoint http://hydra:4445 \
                 --id devfront \
+                --name "DevFront" \
               --grant-type authorization_code,refresh_token \
               --response-type code \
               --scope openid,offline_access,profile,email \
diff --git a/docker/staging_pull_compose.template.yaml b/docker/staging_pull_compose.template.yaml
index 01c6b86f..0430cab4 100644
--- a/docker/staging_pull_compose.template.yaml
+++ b/docker/staging_pull_compose.template.yaml
@@ -282,6 +282,7 @@ services:
         hydra create oauth2-client \
           --endpoint http://hydra:4445 \
           --id adminfront \
+          --name "AdminFront" \
           --grant-type authorization_code,refresh_token \
           --response-type code \
           --scope openid,offline_access,profile,email \
@@ -291,6 +292,7 @@ services:
         hydra create oauth2-client \
           --endpoint http://hydra:4445 \
           --id devfront \
+          --name "DevFront" \
           --grant-type authorization_code,refresh_token \
           --response-type code \
           --scope openid,offline_access,profile,email \
diff --git a/userfront/lib/features/auth/presentation/consent_screen.dart b/userfront/lib/features/auth/presentation/consent_screen.dart
index 327b63ff..b8c57597 100644
--- a/userfront/lib/features/auth/presentation/consent_screen.dart
+++ b/userfront/lib/features/auth/presentation/consent_screen.dart
@@ -233,10 +233,13 @@ class _ConsentScreenState extends State<ConsentScreen> {
   }
 
   Widget _buildConsentCard(BuildContext context) {
-    final clientName =
-        _consentInfo?['client']?['client_name'] ??
-        tr('msg.userfront.consent.client_unknown');
-    final clientId = _consentInfo?['client']?['client_id'] ?? '-';
+    final clientRawName = _consentInfo?['client']?['client_name'] as String?;
+    final clientId = _consentInfo?['client']?['client_id'] as String? ?? '-';
+    final clientName = (clientRawName != null && clientRawName.isNotEmpty)
+        ? clientRawName
+        : (clientId != '-'
+            ? clientId
+            : tr('msg.userfront.consent.client_unknown'));
     final clientLogo = _consentInfo?['client']?['logo_uri'];
     final requestedScopes =
         (_consentInfo?['requested_scope'] as List<dynamic>?)?.cast<String>() ??