diff --git a/src/oidc.js b/src/oidc.js
index dc32b04e6..95d86fe23 100644
--- a/src/oidc.js
+++ b/src/oidc.js
@@ -319,37 +319,20 @@ function renderInteractionPage(provider) {
 
             debug(`route interaction get uid:${uid} prompt.name:${prompt.name} client_id:${params.client_id} session:${session}`);
 
-            const client = await provider.Client.find(params.client_id);
+            const [error, client] = await safe(clientsGet(params.client_id));
+            if (error) return next(error);
 
             switch (prompt.name) {
             case 'login': {
                 return res.render('login', {
-                    client,
                     submitUrl: `${ROUTE_PREFIX}/interaction/${uid}/login`,
-                    uid,
-                    details: prompt.details,
-                    params,
-                    title: 'Sign-in',
-                    session: session ? debug(session) : undefined,
-                    dbg: {
-                        params: debug(params),
-                        prompt: debug(prompt),
-                    },
+                    name: client?.name || 'Cloudron'
                 });
             }
             case 'consent': {
                 return res.render('interaction', {
-                    client,
                     submitUrl: `${ROUTE_PREFIX}/interaction/${uid}/confirm`,
-                    uid,
-                    details: prompt.details,
-                    params,
-                    title: 'Authorize',
-                    session: session ? debug(session) : undefined,
-                    dbg: {
-                        params: debug(params),
-                        prompt: debug(prompt),
-                    },
+                    name: client?.name || 'Cloudron'
                 });
             }
             default:
diff --git a/src/oidc_templates/interaction.ejs b/src/oidc_templates/interaction.ejs
index 3f300f46a..bec8f0054 100644
--- a/src/oidc_templates/interaction.ejs
+++ b/src/oidc_templates/interaction.ejs
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height" />
 
-    <title>Cloudron Login</title>
+    <title>Authorize <%= name %></title>
 
     <!-- Theme CSS -->
     <link type="text/css" rel="stylesheet" href="/theme.css">
@@ -26,7 +26,7 @@
         <div class="col-md-12" style="text-align: center;">
           <img width="128" height="128" style="margin-top: -84px" src="/api/v1/cloudron/avatar"/>
           <br/>
-          <h1>Cloudron Login</h1>
+          <h1>Authorize <%= name %></h1>
         </div>
       </div>
       <br/>
diff --git a/src/oidc_templates/login.ejs b/src/oidc_templates/login.ejs
index 311a146b8..596d3696e 100644
--- a/src/oidc_templates/login.ejs
+++ b/src/oidc_templates/login.ejs
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height" />
 
-    <title>Cloudron Login</title>
+    <title>Login to <%= name %></title>
 
     <!-- Theme CSS -->
     <link type="text/css" rel="stylesheet" href="/theme.css">
@@ -26,7 +26,7 @@
         <div class="col-md-12" style="text-align: center;">
           <img width="128" height="128" style="margin-top: -84px" src="/api/v1/cloudron/avatar"/>
           <br/>
-          <h1>Cloudron Login</h1>
+          <h1>Login to <%= name %></h1>
         </div>
       </div>
       <br/>