diff --git a/app/src/main/java/it/chalmers/gamma/adapter/primary/web/ClientsController.java b/app/src/main/java/it/chalmers/gamma/adapter/primary/web/ClientsController.java
index d997f8d7d..6df03aada 100644
--- a/app/src/main/java/it/chalmers/gamma/adapter/primary/web/ClientsController.java
+++ b/app/src/main/java/it/chalmers/gamma/adapter/primary/web/ClientsController.java
@@ -418,6 +418,18 @@ public ModelAndView createAuthority(
     return mv;
   }
 
+  @DeleteMapping("/clients/{id}")
+  public ModelAndView deleteClient(@RequestHeader(value = "HX-Request", required = true) boolean htmxRequest,
+                                   @PathVariable("id") UUID clientUid) {
+      try {
+          this.clientFacade.delete(clientUid);
+      } catch (ClientFacade.ClientNotFoundException e) {
+          throw new RuntimeException(e);
+      }
+
+    return new ModelAndView("redirect:/clients");
+  }
+
   @DeleteMapping("/clients/{id}/authority/{name}")
   public ModelAndView deleteClientAuthority(
       @RequestHeader(value = "HX-Request", required = true) boolean htmxRequest,
diff --git a/app/src/main/resources/templates/pages/client-details.html b/app/src/main/resources/templates/pages/client-details.html
index 396eb1890..3974c7a66 100644
--- a/app/src/main/resources/templates/pages/client-details.html
+++ b/app/src/main/resources/templates/pages/client-details.html
@@ -35,6 +35,11 @@
                 <span th:each="restrictionSuperGroup, stat : ${client.restriction().superGroups()}" th:text="${restrictionSuperGroup.prettyName() + (stat.count == client.restriction().superGroups().size() ? '' : ', ')}"></span>
             </li>
         </ul>
+        <footer>
+            <form data-hx-confirm="Are you sure you want to delete this client?" th:action="|/clients/${clientUid}|" th:method="delete">
+                <button class="outline contrast" data-loading-disable>Delete</button>
+            </form>
+        </footer>
     </article>
 
     <th:block th:each="clientAuthority : ${clientAuthorities}">
diff --git a/app/src/main/resources/templates/pages/user-client-details.html b/app/src/main/resources/templates/pages/user-client-details.html
deleted file mode 100644
index a3e63eea8..000000000
--- a/app/src/main/resources/templates/pages/user-client-details.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<header th:replace="~{common/header}"></header>
-<main>
-    <ul>
-        <li th:text="${client.prettyName()}"></li>
-        <li th:text="${client.svDescription()}"></li>
-        <li th:text="${client.enDescription()}"></li>
-        <li th:text="${client.clientId()}"></li>
-        <li th:text="|Has api key: ${client.hasApiKey()}|"></li>
-        <li th:text="${client.webServerRedirectUrl()}"></li>
-        <li th:if="${client.restriction() != null}">
-            Super group restrictions
-            <ul>
-                <li th:each="restrictionSuperGroup : ${client.restriction().superGroups()}" th:text="${restrictionSuperGroup.prettyName()}"></li>
-            </ul>
-        </li>
-    </ul>
-    <p>Authorities</p>
-    <th:block th:fragment="client-authorities" >
-        <div th:data-hx-get="@{/user-clients/{id}/authorities(id=${client.clientUid})}" data-hx-target="this" data-hx-swap="outerHTML" data-hx-trigger="authorities-updated from:body">
-            <ul>
-                <li th:each="clientAuthority : ${clientAuthorities}">
-                    <p th:text="${clientAuthority.authorityName()}"></p>
-                    <p>
-                        Super groups
-                    </p>
-                    <ul>
-                        <li th:each="superGroup : ${clientAuthority.superGroups()}" th:text="${superGroup.prettyName()}"></li>
-                    </ul>
-                    <p>
-                        Users
-                    </p>
-                    <ul>
-                        <li th:each="user : ${clientAuthority.users()}" th:text="${user.nick()}"></li>
-                    </ul>
-                </li>
-            </ul>
-        </div>
-        <button th:data-hx-get="@{/user-clients/{id}/new-authority(id=${client.clientUid()})}" data-hx-target="this" data-hx-swap="outerHTML">Add authority</button>
-    </th:block>
-    <p>User approvals</p>
-    <ul>
-        <li th:each="userApproval : ${userApprovals}" th:text="${userApproval.nick()}"></li>
-    </ul>
-</main>
\ No newline at end of file