diff --git a/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.html b/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.html
index 35c6a73ba..ec9cceae9 100644
--- a/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.html
+++ b/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.html
@@ -8,6 +8,8 @@
       <div class="row">
         <div class="col">
           <app-input-text i18n-title title="Username" formControlName="username" [error]="error?.username"></app-input-text>
+          <app-input-text i18n-title title="Email" formControlName="email" [error]="error?.email"></app-input-text>
+          <app-input-password i18n-title title="Password" formControlName="password" [error]="error?.password"></app-input-password>
           <app-input-text i18n-title title="First name" formControlName="first_name" [error]="error?.first_name"></app-input-text>
           <app-input-text i18n-title title="Last name" formControlName="last_name" [error]="error?.first_name"></app-input-text>
 
diff --git a/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.ts
index 70dcd42af..8adf6f324 100644
--- a/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.ts
+++ b/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.ts
@@ -48,6 +48,8 @@ export class UserEditDialogComponent
   getForm(): FormGroup {
     return new FormGroup({
       username: new FormControl(''),
+      email: new FormControl(''),
+      password: new FormControl(null),
       first_name: new FormControl(''),
       last_name: new FormControl(''),
       is_active: new FormControl(true),
diff --git a/src/paperless/serialisers.py b/src/paperless/serialisers.py
index a46d4897b..63ddb773a 100644
--- a/src/paperless/serialisers.py
+++ b/src/paperless/serialisers.py
@@ -31,6 +31,7 @@ class UserSerializer(serializers.ModelSerializer):
         fields = (
             "id",
             "username",
+            "email",
             "password",
             "first_name",
             "last_name",