diff --git a/dashboard/src/views/oidc.html b/dashboard/src/views/oidc.html
index e5f8ae78b..0f36d2c2f 100644
--- a/dashboard/src/views/oidc.html
+++ b/dashboard/src/views/oidc.html
@@ -43,6 +43,40 @@
   </div>
 </div>
 
+<!-- Modal client edit -->
+<div class="modal fade" id="clientEditModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h4 class="modal-title">Edit client {{ clientEdit.id }}</h4>
+        </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="inputEditClientSecret">Client Secret</label>
+              <input type="text" id="inputEditClientSecret" class="form-control" name="clientSecret" ng-model="clientEdit.secret" required/>
+            </div>
+            <div class="form-group">
+              <label class="control-label" for="inputEditLoginRedirectUri">Login callback Url</label>
+              <input type="url" id="inputEditLoginRedirectUri" class="form-control" name="loginRedirectUri" ng-model="clientEdit.loginRedirectUri" required/>
+            </div>
+            <div class="form-group">
+              <label class="control-label" for="inputEditLogoutRedirectUri">Logout callback Url (optional)</label>
+              <input type="url" id="inputEditLogoutRedirectUri" class="form-control" name="logoutRedirectUri" ng-model="clientEdit.logoutRedirectUri"/>
+            </div>
+            <input class="ng-hide" type="submit" ng-disabled="clientEditForm.$invalid"/>
+          </form>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.close' | tr }}</button>
+          <button type="button" class="btn btn-success" ng-click="clientEdit.submit()" ng-disabled="clientEditForm.$invalid || clientEdit.busy">
+            <i class="fa fa-circle-notch fa-spin" ng-show="clientEdit.busy"></i> {{ 'main.dialog.save' | tr }}
+          </button>
+        </div>
+      </div>
+  </div>
+</div>
+
 <!-- Modal client delete -->
 <div class="modal fade" id="clientDeleteModal" tabindex="-1" role="dialog">
   <div class="modal-dialog">
@@ -121,14 +155,15 @@
                 <td colspan="3" class="text-center">No clients yet</td>
               </tr>
               <tr ng-repeat="client in clients">
-                <td class="text-left elide-table-cell">
+                <td class="text-left elide-table-cell hand" ng-click="clientEdit.show(client)">
                   {{ client.id }}
                 </td>
-                <td class="text-left elide-table-cell">
+                <td class="text-left elide-table-cell hand" ng-click="clientEdit.show(client)">
                   {{ client.secret }}
                 </td>
                 <td class="text-right no-wrap" style="vertical-align: bottom">
-                  <button class="btn btn-xs btn-danger pull-right" ng-click="deleteClient.show(client.id)" uib-tooltip="Delete"><i class="far fa-trash-alt"></i></button>
+                  <button class="btn btn-xs btn-danger" ng-click="deleteClient.show(client)" uib-tooltip="Delete"><i class="far fa-trash-alt"></i></button>
+                  <button class="btn btn-xs btn-default" ng-click="clientEdit.show(client)" uib-tooltip="Edit"><i class="far fa fa-pencil-alt"></i></button>
                 </td>
               </tr>
             </tbody>
diff --git a/dashboard/src/views/oidc.js b/dashboard/src/views/oidc.js
index cd03e8694..3d23a84d0 100644
--- a/dashboard/src/views/oidc.js
+++ b/dashboard/src/views/oidc.js
@@ -64,14 +64,55 @@ angular.module('Application').controller('OidcController', ['$scope', '$location
         }
     };
 
+    $scope.clientEdit = {
+        busy: false,
+        error: {},
+        id: '',
+        secret: '',
+        loginRedirectUri: '',
+        logoutRedirectUri: '',
+
+        show: function (client) {
+            $scope.clientEdit.id = client.id;
+            $scope.clientEdit.secret = client.secret;
+            $scope.clientEdit.loginRedirectUri = client.loginRedirectUri;
+            $scope.clientEdit.logoutRedirectUri = client.logoutRedirectUri;
+            $scope.clientEdit.busy = false;
+            $scope.clientEdit.error = null;
+            $scope.clientEditForm.$setPristine();
+
+            $('#clientEditModal').modal('show');
+        },
+
+        submit: function () {
+            $scope.clientEdit.busy = true;
+            $scope.clientEdit.error = {};
+
+            Client.updateOidcClient($scope.clientEdit.id, $scope.clientEdit.secret, $scope.clientEdit.loginRedirectUri, $scope.clientEdit.logoutRedirectUri, function (error) {
+                if (error) {
+                    console.error('Unable to edit openid client.', error);
+
+                    $scope.clientEdit.busy = false;
+
+                    return;
+                }
+
+                $scope.refreshClients();
+                $scope.clientEdit.busy = false;
+
+                $('#clientEditModal').modal('hide');
+            });
+        }
+    };
+
     $scope.deleteClient = {
         busy: false,
         error: {},
         id: '',
 
-        show: function (clientId) {
+        show: function (client) {
             $scope.deleteClient.busy = false;
-            $scope.deleteClient.id = clientId;
+            $scope.deleteClient.id = client.id;
 
             $('#clientDeleteModal').modal('show');
         },
@@ -94,7 +135,7 @@ angular.module('Application').controller('OidcController', ['$scope', '$location
     });
 
     // setup all the dialog focus handling
-    ['clientAddModal', 'clientEditModal'].forEach(function (id) {
+    ['clientAddModal', 'clientEditmodal'].forEach(function (id) {
         $('#' + id).on('shown.bs.modal', function () {
             $(this).find('[autofocus]:first').focus();
         });
diff --git a/src/routes/oidcclients.js b/src/routes/oidcclients.js
index a90b2f6bd..6a5eceb3f 100644
--- a/src/routes/oidcclients.js
+++ b/src/routes/oidcclients.js
@@ -47,10 +47,10 @@ async function update(req, res, next) {
     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, { secret: req.body.secret, loginRedirectUri: req.body.loginRedirectUri, logoutRedirectUri: req.body.logoutRedirectUri || ''}));
+    const [error] = await safe(oidc.clients.update(req.params.clientId, req.body.secret, req.body.loginRedirectUri, req.body.logoutRedirectUri || ''));
     if (error) return next(BoxError.toHttpError(error));
 
-    next(new HttpSuccess(200, {}));
+    next(new HttpSuccess(201, {}));
 }
 
 async function list(req, res, next) {