diff --git a/src/components/rooms.js b/src/components/rooms.js
index ba3bd8b..62f65a3 100644
--- a/src/components/rooms.js
+++ b/src/components/rooms.js
@@ -1,8 +1,14 @@
-import React from "react";
-import { Datagrid, List, TextField } from "react-admin";
+import React, { Fragment } from "react";
+import { Datagrid, List, TextField, BulkDeleteButton } from "react-admin";
+
+const RoomBulkActionButtons = props => (
+  <Fragment>
+    <BulkDeleteButton {...props} label="resources.rooms.action.purge" />
+  </Fragment>
+);
 
 export const RoomList = props => (
-  <List {...props}>
+  <List {...props} bulkActionButtons={<RoomBulkActionButtons />}>
     <Datagrid>
       <TextField source="room_id" />
       <TextField source="name" />
diff --git a/src/components/users.js b/src/components/users.js
index 1a42853..4a97dea 100644
--- a/src/components/users.js
+++ b/src/components/users.js
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { Fragment } from "react";
 import {
   Datagrid,
   Create,
@@ -14,6 +14,11 @@ import {
   TextInput,
   ReferenceField,
   regex,
+  Toolbar,
+  SaveButton,
+  DeleteButton,
+  ListButton,
+  BulkDeleteButton,
 } from "react-admin";
 
 const UserFilter = props => (
@@ -27,11 +32,34 @@ const UserFilter = props => (
   </Filter>
 );
 
+const UserEditToolbar = props => (
+  <Toolbar {...props} >
+    <SaveButton submitOnEnter={true} />
+    <DeleteButton
+      label="resources.users.action.deactivate"
+      submitOnEnter={false}
+      variant="flat"
+    />
+    <ListButton
+      label="resources.users.action.backtolist"
+      submitOnEnter={false}
+      variant="flat"
+    />
+  </Toolbar>
+);
+
+const UserBulkActionButtons = props => (
+  <Fragment>
+    <BulkDeleteButton {...props} label="resources.users.action.deactivate" />
+  </Fragment>
+);
+
 export const UserList = props => (
   <List
     {...props}
     filters={<UserFilter />}
     filterDefaultValues={{ guests: true, deactivated: false }}
+    bulkActionButtons={<UserBulkActionButtons />}
   >
     <Datagrid rowClick="edit">
       <ReferenceField
@@ -78,7 +106,7 @@ export const UserCreate = props => (
 
 export const UserEdit = props => (
   <Edit {...props}>
-    <SimpleForm>
+    <SimpleForm toolbar={<UserEditToolbar />}>
       <TextInput source="id" disabled />
       <TextInput source="displayname" />
       <PasswordInput source="password" autoComplete="new-password" />
diff --git a/src/i18n/de.js b/src/i18n/de.js
index 6626ae7..5a7e55c 100644
--- a/src/i18n/de.js
+++ b/src/i18n/de.js
@@ -28,6 +28,10 @@ export default {
         displayname: "Anzeigename",
         password: "Passwort",
       },
+      action: {
+        deactivate: "Deaktiviere Benutzer",
+        backtolist: "Zurück zur Liste",
+      },
     },
     rooms: {
       name: "Raum |||| Räume",
@@ -37,6 +41,9 @@ export default {
         canonical_alias: "Alias",
         joined_members: "Mitglieder",
       },
+      action: {
+        purge: "Säubere Raum",
+      },
     },
   },
 };
diff --git a/src/i18n/en.js b/src/i18n/en.js
index 0683213..419673f 100644
--- a/src/i18n/en.js
+++ b/src/i18n/en.js
@@ -28,6 +28,10 @@ export default {
         displayname: "Displayname",
         password: "Password",
       },
+      action: {
+        deactivate: "Deactivate user",
+        backtolist: "Back to list",
+      },
     },
     rooms: {
       name: "Room |||| Rooms",
@@ -37,6 +41,9 @@ export default {
         canonical_alias: "Alias",
         joined_members: "Members",
       },
+      action: {
+        purge: "Säubere Raum",
+      },
     },
   },
 };