diff --git a/src/components/users.js b/src/components/users.js
index 068b59e..4f9c6f9 100644
--- a/src/components/users.js
+++ b/src/components/users.js
@@ -1,11 +1,13 @@
 import React from "react";
 import {
+  ArrayInput,
   Datagrid,
   Create,
   Edit,
   List,
   Filter,
   SimpleForm,
+  SimpleFormIterator,
   BooleanField,
   BooleanInput,
   ImageField,
@@ -13,6 +15,7 @@ import {
   TextField,
   TextInput,
   ReferenceField,
+  SelectInput,
   regex,
 } from "react-admin";
 
@@ -73,6 +76,18 @@ export const UserCreate = props => (
       <TextInput source="displayname" />
       <PasswordInput source="password" autoComplete="new-password" />
       <BooleanInput source="admin" />
+      <ArrayInput source="threepids">
+        <SimpleFormIterator>
+          <SelectInput
+            source="medium"
+            choices={[
+              { id: "email", name: "resources.users.email" },
+              { id: "msisdn", name: "resources.users.msisdn" },
+            ]}
+          />
+          <TextInput source="address" />
+        </SimpleFormIterator>
+      </ArrayInput>
     </SimpleForm>
   </Create>
 );
@@ -85,6 +100,18 @@ export const UserEdit = props => (
       <PasswordInput source="password" autoComplete="new-password" />
       <BooleanInput source="admin" />
       <BooleanInput source="deactivated" />
+      <ArrayInput source="threepids">
+        <SimpleFormIterator>
+          <SelectInput
+            source="medium"
+            choices={[
+              { id: "email", name: "resources.users.email" },
+              { id: "msisdn", name: "resources.users.msisdn" },
+            ]}
+          />
+          <TextInput source="address" />
+        </SimpleFormIterator>
+      </ArrayInput>
     </SimpleForm>
   </Edit>
 );
diff --git a/src/i18n/de.js b/src/i18n/de.js
index 6626ae7..f469455 100644
--- a/src/i18n/de.js
+++ b/src/i18n/de.js
@@ -15,6 +15,8 @@ export default {
   resources: {
     users: {
       name: "Benutzer",
+      email: "E-Mail",
+      msisdn: "Telefon",
       fields: {
         avatar: "Avatar",
         id: "Benutzer-ID",
@@ -27,6 +29,10 @@ export default {
         user_id: "Suche Benutzer",
         displayname: "Anzeigename",
         password: "Passwort",
+        avatar_url: "Avatar URL",
+        medium: "Medium",
+        threepids: "3PIDs",
+        address: "Adresse",
       },
     },
     rooms: {
diff --git a/src/i18n/en.js b/src/i18n/en.js
index 0683213..a56d196 100644
--- a/src/i18n/en.js
+++ b/src/i18n/en.js
@@ -15,6 +15,8 @@ export default {
   resources: {
     users: {
       name: "User |||| Users",
+      email: "Email",
+      msisdn: "Phone",
       fields: {
         avatar: "Avatar",
         id: "User-ID",
@@ -27,6 +29,10 @@ export default {
         user_id: "Search user",
         displayname: "Displayname",
         password: "Password",
+        avatar_url: "Avatar URL",
+        medium: "Medium",
+        threepids: "3PIDs",
+        address: "Address",
       },
     },
     rooms: {