diff --git a/dashboard/src/js/client.js b/dashboard/src/js/client.js
index 2334c8fe0..c770f19f6 100644
--- a/dashboard/src/js/client.js
+++ b/dashboard/src/js/client.js
@@ -1946,9 +1946,10 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         });
     };
 
-    Client.prototype.addOidcClient = function (id, secret, loginRedirectUri, logoutRedirectUri, callback) {
+    Client.prototype.addOidcClient = function (id, name, secret, loginRedirectUri, logoutRedirectUri, callback) {
         var data = {
             id: id,
+            name: name,
             secret: secret,
             loginRedirectUri: loginRedirectUri
         };
@@ -1963,9 +1964,10 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         });
     };
 
-    Client.prototype.updateOidcClient = function (id, secret, loginRedirectUri, logoutRedirectUri, callback) {
+    Client.prototype.updateOidcClient = function (id, name, secret, loginRedirectUri, logoutRedirectUri, callback) {
         var data = {
             secret: secret,
+            name: name,
             loginRedirectUri: loginRedirectUri
         };
 
diff --git a/dashboard/src/views/oidc.html b/dashboard/src/views/oidc.html
index 074559f8c..1816c4363 100644
--- a/dashboard/src/views/oidc.html
+++ b/dashboard/src/views/oidc.html
@@ -11,9 +11,13 @@
           <br/>
           <br/>
           <form name="clientAddForm" role="form" novalidate ng-submit="clientAdd.submit()" autocomplete="off">
+            <div class="form-group">
+              <label class="control-label" for="clientName">Name</label>
+              <input type="text" id="clientName" class="form-control" name="clientName" ng-model="clientAdd.name" autofocus required/>
+            </div>
             <div class="form-group" ng-class="{ 'has-error': clientAdd.error.id }">
               <label class="control-label" for="clientId">Client ID</label>
-              <input type="text" id="clientId" class="form-control" name="clientId" ng-model="clientAdd.id" autofocus required/>
+              <input type="text" id="clientId" class="form-control" name="clientId" ng-model="clientAdd.id" required/>
               <div class="control-label" ng-show="clientAdd.error.id">
                 <small>{{ clientAdd.error.id }}</small>
               </div>
@@ -52,6 +56,10 @@
         </div>
         <div class="modal-body">
           <form name="clientEditForm" role="form" novalidate ng-submit="clientEdit.submit()" autocomplete="off">
+            <div class="form-group">
+              <label class="control-label" for="inputEditClientName">Name</label>
+              <input type="text" id="inputEditClientName" class="form-control" name="clientName" ng-model="clientEdit.name" autofocus required/>
+            </div>
             <div class="form-group">
               <label class="control-label" for="inputEditClientSecret">Client Secret</label>
               <input type="text" id="inputEditClientSecret" class="form-control" name="clientSecret" ng-model="clientEdit.secret" required/>
@@ -149,8 +157,9 @@
           <table class="table table-hover">
             <thead>
               <tr>
-                <th style="width: 45%">Client ID</th>
-                <th style="width: 45%">Client Secret</th>
+                <th style="width: 33%">Name</th>
+                <th style="width: 33%">Client ID</th>
+                <th style="width: 33%">Client Secret</th>
                 <th style="width: 10%" class="text-right">{{ 'main.actions' | tr }}</th>
               </tr>
             </thead>
@@ -159,6 +168,9 @@
                 <td colspan="3" class="text-center">No clients yet</td>
               </tr>
               <tr ng-repeat="client in clients">
+                <td class="text-left elide-table-cell hand" ng-click="clientEdit.show(client)">
+                  {{ client.name }}
+                </td>
                 <td class="text-left elide-table-cell hand" ng-click="clientEdit.show(client)">
                   {{ client.id }}
                 </td>
diff --git a/dashboard/src/views/oidc.js b/dashboard/src/views/oidc.js
index 3d23a84d0..35d8c0d27 100644
--- a/dashboard/src/views/oidc.js
+++ b/dashboard/src/views/oidc.js
@@ -22,6 +22,7 @@ angular.module('Application').controller('OidcController', ['$scope', '$location
         busy: false,
         error: {},
         id: '',
+        name: '',
         secret: '',
         loginRedirectUri: '',
         logoutRedirectUri: '',
@@ -29,6 +30,7 @@ angular.module('Application').controller('OidcController', ['$scope', '$location
         show: function () {
             $scope.clientAdd.id = '';
             $scope.clientAdd.secret = '';
+            $scope.clientAdd.name = '';
             $scope.clientAdd.loginRedirectUri = '';
             $scope.clientAdd.logoutRedirectUri = '';
             $scope.clientAdd.busy = false;
@@ -42,7 +44,7 @@ angular.module('Application').controller('OidcController', ['$scope', '$location
             $scope.clientAdd.busy = true;
             $scope.clientAdd.error = {};
 
-            Client.addOidcClient($scope.clientAdd.id, $scope.clientAdd.secret, $scope.clientAdd.loginRedirectUri, $scope.clientAdd.logoutRedirectUri, function (error) {
+            Client.addOidcClient($scope.clientAdd.id, $scope.clientAdd.name, $scope.clientAdd.secret, $scope.clientAdd.loginRedirectUri, $scope.clientAdd.logoutRedirectUri, function (error) {
                 if (error) {
                     if (error.statusCode === 409) {
                         $scope.clientAdd.error.id = 'Client ID already exists';
@@ -68,12 +70,14 @@ angular.module('Application').controller('OidcController', ['$scope', '$location
         busy: false,
         error: {},
         id: '',
+        name: '',
         secret: '',
         loginRedirectUri: '',
         logoutRedirectUri: '',
 
         show: function (client) {
             $scope.clientEdit.id = client.id;
+            $scope.clientEdit.name = client.name;
             $scope.clientEdit.secret = client.secret;
             $scope.clientEdit.loginRedirectUri = client.loginRedirectUri;
             $scope.clientEdit.logoutRedirectUri = client.logoutRedirectUri;
@@ -88,7 +92,7 @@ angular.module('Application').controller('OidcController', ['$scope', '$location
             $scope.clientEdit.busy = true;
             $scope.clientEdit.error = {};
 
-            Client.updateOidcClient($scope.clientEdit.id, $scope.clientEdit.secret, $scope.clientEdit.loginRedirectUri, $scope.clientEdit.logoutRedirectUri, function (error) {
+            Client.updateOidcClient($scope.clientEdit.id, $scope.clientEdit.name, $scope.clientEdit.secret, $scope.clientEdit.loginRedirectUri, $scope.clientEdit.logoutRedirectUri, function (error) {
                 if (error) {
                     console.error('Unable to edit openid client.', error);
 
diff --git a/migrations/20230316134353-oidc-clients-add-table.js b/migrations/20230316134353-oidc-clients-add-table.js
index d0afc1077..0bbcf8e57 100644
--- a/migrations/20230316134353-oidc-clients-add-table.js
+++ b/migrations/20230316134353-oidc-clients-add-table.js
@@ -4,6 +4,8 @@ exports.up = async function (db) {
     var cmd = 'CREATE TABLE oidcClients(' +
         'id VARCHAR(128) NOT NULL UNIQUE,' +
         'secret VARCHAR(128) NOT NULL,' +
+        'appId VARCHAR(128) DEFAULT "", ' +
+        'name VARCHAR(128) DEFAULT "", ' +
         'loginRedirectUri VARCHAR(256) NOT NULL,' +
         'logoutRedirectUri VARCHAR(256) NOT NULL,' +
         'PRIMARY KEY (id))';
diff --git a/migrations/schema.sql b/migrations/schema.sql
index 4bf3d4eca..e8afb8cc1 100644
--- a/migrations/schema.sql
+++ b/migrations/schema.sql
@@ -316,6 +316,8 @@ CREATE TABLE IF NOT EXISTS appLinks(
 CREATE TABLE IF NOT EXISTS oidcClients(
     id VARCHAR(128) NOT NULL UNIQUE,
     secret VARCHAR(128) DEFAULT "",
+    appId VARCHAR(128) DEFAULT "",
+    name VARCHAR(128) DEFAULT "",
     loginRedirectUri VARCHAR(256) DEFAULT "",
     logoutRedirectUri VARCHAR(256) DEFAULT "",
     PRIMARY KEY(id));
diff --git a/src/oidc.js b/src/oidc.js
index 079b2355f..dc32b04e6 100644
--- a/src/oidc.js
+++ b/src/oidc.js
@@ -31,22 +31,27 @@ const assert = require('assert'),
     util = require('util');
 
 const OIDC_CLIENTS_TABLE_NAME = 'oidcClients';
-const OIDC_CLIENTS_FIELDS = [ 'id', 'secret', 'loginRedirectUri', 'logoutRedirectUri' ];
+const OIDC_CLIENTS_FIELDS = [ 'id', 'secret', 'name', 'appId', 'loginRedirectUri', 'logoutRedirectUri' ];
 
 const ROUTE_PREFIX = '/openid';
 
 let gHttpServer = null;
 
-async function clientsAdd(id, secret, loginRedirectUri, logoutRedirectUri) {
+// -----------------------------
+// Database model
+// -----------------------------
+async function clientsAdd(id, data) {
     assert.strictEqual(typeof id, 'string');
-    assert.strictEqual(typeof secret, 'string');
-    assert.strictEqual(typeof loginRedirectUri, 'string');
-    assert.strictEqual(typeof logoutRedirectUri, 'string');
+    assert.strictEqual(typeof data.secret, 'string');
+    assert.strictEqual(typeof data.loginRedirectUri, 'string');
+    assert.strictEqual(typeof data.logoutRedirectUri, 'string');
+    assert.strictEqual(typeof data.name, 'string');
+    assert.strictEqual(typeof data.appId, 'string');
 
-    debug(`clientsAdd: id:${id} secret:${secret} loginRedirectUri:${loginRedirectUri} logoutRedirectUri:${logoutRedirectUri}`);
+    debug(`clientsAdd: id:${id} secret:${data.secret} name:${data.name} appId:${data.appId} loginRedirectUri:${data.loginRedirectUri} logoutRedirectUri:${data.logoutRedirectUri}`);
 
-    const query = `INSERT INTO ${OIDC_CLIENTS_TABLE_NAME} (id, secret, loginRedirectUri, logoutRedirectUri) VALUES (?, ?, ?, ?)`;
-    const args = [ id, secret, loginRedirectUri, logoutRedirectUri ];
+    const query = `INSERT INTO ${OIDC_CLIENTS_TABLE_NAME} (id, secret, name, appId, loginRedirectUri, logoutRedirectUri) VALUES (?, ?, ?, ?, ?, ?)`;
+    const args = [ id, data.secret, data.name, data.appId, data.loginRedirectUri, data.logoutRedirectUri ];
 
     const [error] = await safe(database.query(query, args));
     if (error && error.code === 'ER_DUP_ENTRY') throw new BoxError(BoxError.ALREADY_EXISTS, 'client already exists');
@@ -64,13 +69,17 @@ async function clientsGet(id) {
     return result[0];
 }
 
-async function clientsUpdate(id, secret, loginRedirectUri, logoutRedirectUri) {
+async function clientsUpdate(id, data) {
     assert.strictEqual(typeof id, 'string');
-    assert.strictEqual(typeof secret, 'string');
-    assert.strictEqual(typeof loginRedirectUri, 'string');
-    assert.strictEqual(typeof logoutRedirectUri, 'string');
+    assert.strictEqual(typeof data.secret, 'string');
+    assert.strictEqual(typeof data.loginRedirectUri, 'string');
+    assert.strictEqual(typeof data.logoutRedirectUri, 'string');
+    assert.strictEqual(typeof data.name, 'string');
+    assert.strictEqual(typeof data.appId, 'string');
 
-    const result = await database.query(`UPDATE ${OIDC_CLIENTS_TABLE_NAME} SET secret=?, loginRedirectUri=?, logoutRedirectUri=? WHERE id = ?`, [ secret, loginRedirectUri, logoutRedirectUri, id]);
+    debug(`clientsUpdate: id:${id} secret:${data.secret} name:${data.name} appId:${data.appId} loginRedirectUri:${data.loginRedirectUri} logoutRedirectUri:${data.logoutRedirectUri}`);
+
+    const result = await database.query(`UPDATE ${OIDC_CLIENTS_TABLE_NAME} SET secret=?, name=?, appId=?, loginRedirectUri=?, logoutRedirectUri=? WHERE id = ?`, [ data.secret, data.name, data.appId, data.loginRedirectUri, data.logoutRedirectUri, id]);
     if (result.affectedRows !== 1) throw new BoxError(BoxError.NOT_FOUND, 'client not found');
 }
 
@@ -86,6 +95,9 @@ async function clientsList() {
     return results;
 }
 
+// -----------------------------
+// Generic oidc node module data store model
+// -----------------------------
 class CloudronAdapter {
     /**
      *
@@ -294,6 +306,9 @@ class CloudronAdapter {
     }
 }
 
+// -----------------------------
+// Route handler
+// -----------------------------
 function renderInteractionPage(provider) {
     assert.strictEqual(typeof provider, 'object');
 
diff --git a/src/routes/oidcclients.js b/src/routes/oidcclients.js
index 6a5eceb3f..d5ad734fc 100644
--- a/src/routes/oidcclients.js
+++ b/src/routes/oidcclients.js
@@ -19,11 +19,20 @@ async function add(req, res, next) {
     assert.strictEqual(typeof req.body, 'object');
 
     if (typeof req.body.id !== 'string' || !req.body.id) return next(new HttpError(400, 'id must be non-empty string'));
+    if (typeof req.body.name !== 'string' || !req.body.name) return next(new HttpError(400, 'name must be non-empty string'));
     if (typeof req.body.secret !== 'string' || !req.body.secret) return next(new HttpError(400, 'secret must be non-empty string'));
     if (typeof req.body.loginRedirectUri !== 'string' || !req.body.loginRedirectUri) return next(new HttpError(400, 'loginRedirectUri must be non-empty string'));
     if ('logoutRedirectUri' in req.body && (typeof req.body.logoutRedirectUri !== 'string' || !req.body.logoutRedirectUri)) return next(new HttpError(400, 'logoutRedirectUri must be non-empty string if provided'));
 
-    const [error] = await safe(oidc.clients.add(req.body.id, req.body.secret, req.body.loginRedirectUri, req.body.logoutRedirectUri || ''));
+    const data = {
+        secret: req.body.secret,
+        name: req.body.name,
+        appId: '', // always empty for custom clients
+        loginRedirectUri: req.body.loginRedirectUri,
+        logoutRedirectUri: req.body.logoutRedirectUri || ''
+    };
+
+    const [error] = await safe(oidc.clients.add(req.body.id, data));
     if (error) return next(BoxError.toHttpError(error));
 
     next(new HttpSuccess(201, {}));
@@ -43,11 +52,20 @@ async function update(req, res, next) {
     assert.strictEqual(typeof req.params.clientId, 'string');
     assert.strictEqual(typeof req.body, 'object');
 
+    if (typeof req.body.name !== 'string' || !req.body.name) return next(new HttpError(400, 'name must be non-empty string'));
     if (typeof req.body.secret !== 'string' || !req.body.secret) return next(new HttpError(400, 'secret must be non-empty string'));
     if (typeof req.body.loginRedirectUri !== 'string' || !req.body.loginRedirectUri) return next(new HttpError(400, 'loginRedirectUri must be non-empty string'));
     if ('logoutRedirectUri' in req.body && (typeof req.body.logoutRedirectUri !== 'string' || !req.body.logoutRedirectUri)) return next(new HttpError(400, 'logoutRedirectUri must be non-empty string if provided'));
 
-    const [error] = await safe(oidc.clients.update(req.params.clientId, req.body.secret, req.body.loginRedirectUri, req.body.logoutRedirectUri || ''));
+    const data = {
+        secret: req.body.secret,
+        name: req.body.name,
+        appId: '', // always empty for custom clients
+        loginRedirectUri: req.body.loginRedirectUri,
+        logoutRedirectUri: req.body.logoutRedirectUri || ''
+    };
+
+    const [error] = await safe(oidc.clients.update(req.params.clientId, data));
     if (error) return next(BoxError.toHttpError(error));
 
     next(new HttpSuccess(201, {}));